OMC/nms_cxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mager: 合并11.3版本，包名和主线一样方便复制

Browse Source
This commit is contained in:
TsMask
2024-11-23 18:54:02 +08:00
parent c0368c07ef
commit d5954d40c8
514 changed files with 24451 additions and 17932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
features/aaaa/aaaa.go
View File

@@ -9,11 +9,11 @@ import (
"github.com/go-resty/resty/v2"
"nms_cxy/lib/dborm"
"nms_cxy/lib/log"
"nms_cxy/lib/oauth"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/dborm"
"be.ems/lib/log"
"be.ems/lib/oauth"
"be.ems/lib/services"
"be.ems/restagent/config"
)
var (

22
features/cdr/cdrevent.go
View File

@@ -5,13 +5,13 @@ import (
"net/http"
"strings"
"nms_cxy/lib/core/ctx"
"nms_cxy/lib/dborm"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
neService "nms_cxy/src/modules/network_element/service"
wsService "nms_cxy/src/modules/ws/service"
"be.ems/lib/core/ctx"
"be.ems/lib/dborm"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
neService "be.ems/src/modules/network_element/service"
wsService "be.ems/src/modules/ws/service"
)
var (
@@ -56,18 +56,18 @@ func PostCDREventFrom(w http.ResponseWriter, r *http.Request) {
}
// 发送到匹配的网元
neInfo := neService.NewNeInfoImpl.SelectNeInfoByRmuid(cdrEvent.RmUID)
neInfo := neService.NewNeInfo.SelectNeInfoByRmuid(cdrEvent.RmUID)
if neInfo.RmUID == cdrEvent.RmUID {
// 推送到ws订阅组
switch neInfo.NeType {
case "IMS":
if v, ok := cdrEvent.CDR["recordType"]; ok && (v == "MOC" || v == "MTSM") {
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_IMS_CDR+neInfo.NeId, cdrEvent)
wsService.NewWSSend.ByGroupID(wsService.GROUP_IMS_CDR+neInfo.NeId, cdrEvent)
}
case "SMF":
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_SMF_CDR+neInfo.NeId, cdrEvent)
wsService.NewWSSend.ByGroupID(wsService.GROUP_SMF_CDR+neInfo.NeId, cdrEvent)
case "SMSC":
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_SMSC_CDR+neInfo.NeId, cdrEvent)
wsService.NewWSSend.ByGroupID(wsService.GROUP_SMSC_CDR+neInfo.NeId, cdrEvent)
}
}

2
features/cm/exec_linux.go
View File

@@ -9,7 +9,7 @@ import (
"os/exec"
"time"
"nms_cxy/lib/log"
"be.ems/lib/log"
)
func ExecCmd(command string) error {

2
features/cm/exec_windows.go
View File

@@ -9,7 +9,7 @@ import (
"os/exec"
"time"
"nms_cxy/lib/log"
"be.ems/lib/log"
)
func ExecCmd(command string) error {

559
features/cm/license.go
View File

@@ -1,559 +0,0 @@
package cm
import (
"fmt"
"io"
"net/http"
"os"
"os/exec"
"strings"
"nms_cxy/lib/core/ctx"
"nms_cxy/lib/dborm"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
neModel "nms_cxy/src/modules/network_element/model"
neService "nms_cxy/src/modules/network_element/service"
"github.com/gorilla/mux"
)
var (
// General License URI
UriLicense = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/{elementTypeValue}/license"
UriLicenseExt = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/license"
CustomUriLicense = config.UriPrefix + "/systemManagement/{apiVersion}/{elementTypeValue}/license"
CustomUriLicenseExt = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/license"
)
func UploadLicenseFile(w http.ResponseWriter, r *http.Request) {
log.Debug("UploadLicenseFile processing... ")
// _, err := services.CheckFrontValidRequest(w, r)
// if err != nil {
// log.Error("Http request error:", err)
// return
// }
vars := mux.Vars(r)
neType := vars["neType"]
if neType == "" {
log.Error("neType is empty")
services.ResponseNotFound404UriNotExist(w, r)
return
}
// neTypeUpper := strings.ToUpper(neType)
// neTypeLower := strings.ToLower(neType)
services.ResponseStatusOK204NoContent(w)
}
func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) {
log.Debug("DownloadLicenseFile processing... ")
// _, err := services.CheckFrontValidRequest(w, r)
// if err != nil {
// log.Error("Request error:", err)
// return
// }
vars := mux.Vars(r)
neType := vars["neType"]
if neType == "" {
log.Error("neType is empty")
services.ResponseNotFound404UriNotExist(w, r)
return
}
// // neTypeUpper := strings.ToUpper(neType)
// //neTypeLower := strings.ToLower(neType)
// version := vars["version"]
// if version == "" {
// log.Error("version is empty")
// services.ResponseNotFound404UriNotExist(w, r)
// return
// }
// sql := fmt.Sprintf("select * from ne_software where ne_type='%s' and version='%s'", neTypeUpper, version)
// neSoftware, err := dborm.XormGetDataBySQL(sql)
// if err != nil {
// log.Error("Faile to XormGetDataBySQL:", err)
// services.ResponseInternalServerError500ProcessError(w, err)
// return
// } else if len(*neSoftware) == 0 {
// err := global.ErrCMNotFoundTargetSoftware
// log.Error(err)
// services.ResponseInternalServerError500ProcessError(w, err)
// return
// }
// fileName := (*neSoftware)[0]["file_name"]
// path := (*neSoftware)[0]["path"]
// md5Sum := (*neSoftware)[0]["md5_sum"]
// services.ResponseFileWithNameAndMD5(w, http.StatusOK, fileName, path, md5Sum)
}
func DeleteLcenseFile(w http.ResponseWriter, r *http.Request) {
log.Debug("DeleteLcenseFile processing... ")
// _, err := services.CheckFrontValidRequest(w, r)
// if err != nil {
// log.Error("Request error:", err)
// return
// }
vars := mux.Vars(r)
neType := vars["neType"]
if neType == "" {
log.Error("neType is empty")
services.ResponseNotFound404UriNotExist(w, r)
return
}
// neTypeUpper := strings.ToUpper(neType)
// //neTypeLower := strings.ToLower(neType)
// version := vars["version"]
// if version == "" {
// log.Error("version is empty")
// services.ResponseNotFound404UriNotExist(w, r)
// return
// }
// sql := fmt.Sprintf("select * from ne_software where ne_type='%s' and version='%s'", neTypeUpper, version)
// neSoftware, err := dborm.XormGetDataBySQL(sql)
// if err != nil {
// log.Error("Faile to XormGetDataBySQL:", err)
// services.ResponseInternalServerError500ProcessError(w, err)
// return
// } else if len(*neSoftware) == 0 {
// err := global.ErrCMNotFoundTargetSoftware
// log.Error(err)
// services.ResponseInternalServerError500ProcessError(w, err)
// return
// }
// where := fmt.Sprintf("ne_type='%s' and version='%s'", neTypeUpper, version)
// affected, err := dborm.XormDeleteDataByWhere(where, "ne_software")
// if err != nil || affected == 0 {
// log.Error("Faile to XormGetDataBySQL:", err)
// services.ResponseInternalServerError500ProcessError(w, err)
// return
// }
// fileName := (*neSoftware)[0]["file_name"]
// path := (*neSoftware)[0]["path"]
// filePath := fmt.Sprintf("%s/%s", path, fileName)
// err = os.Remove(filePath)
// if err != nil {
// log.Error("Faile to Remove:", err)
// services.ResponseInternalServerError500ProcessError(w, err)
// return
// }
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... ")
// _, err := services.CheckFrontValidRequest(w, r)
// if err != nil {
// log.Error("Http request error:", err)
// return
// }
vars := mux.Vars(r)
neType := vars["elementTypeValue"]
if neType == "" {
log.Error("elementTypeValue is empty")
services.ResponseNotFound404UriNotExist(w, r)
return
}
neTypeUpper := strings.ToUpper(neType)
neTypeLower := strings.ToLower(neType)
//md5Param := services.GetUriParamString(r, "md5Sum", ",", false, false)
neId := services.GetUriParamString(r, "neId", ",", false, false)
neInfo, err := dborm.XormGetNeInfo(neType, neId)
if err != nil {
log.Errorf("Failed to get ne_info:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
log.Debug("neInfo:", neInfo)
licensePath := fmt.Sprintf("%s/%s", config.GetYamlConfig().OMC.License, neTypeLower)
err = os.MkdirAll(licensePath, os.ModePerm)
if err != nil {
log.Error("Failed to Mkdir:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
//fileName, err := services.HandleUploadFile(r, softwarePath, "")
// 解析multipart/form-data请求
err = r.ParseMultipartForm(10 << 20) // 10MB
if err != nil {
log.Error("Faile to ParseMultipartForm:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
// 获取文件和数据
licFile := r.MultipartForm.File["file"]
data := r.MultipartForm.Value["comment"]
var licenseFileName, comment string
// 处理license文件
if len(licFile) > 0 {
file := licFile[0]
// 打开文件
f, err := file.Open()
if err != nil {
log.Error("Faile to Open:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
defer f.Close()
// 创建本地文件
dst, err := os.Create(licensePath + "/" + file.Filename)
if err != nil {
log.Error("Faile to Create:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
defer dst.Close()
licenseFileName = file.Filename
// 将文件内容拷贝到本地文件
_, err = io.Copy(dst, f)
if err != nil {
log.Error("Faile to Copy:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
}
// 处理数据
if len(data) > 0 {
comment = data[0]
}
neLicensePath := strings.ReplaceAll(config.GetYamlConfig().NE.LicenseDir, "{neType}", neTypeLower)
srcFile := fmt.Sprintf("%s/%s", licensePath, licenseFileName)
scpDir := fmt.Sprintf("%s@%s:%s", config.GetYamlConfig().NE.User, neInfo.Ip, config.GetYamlConfig().NE.ScpDir)
cmd := exec.Command("scp", "-r", srcFile, scpDir)
out, err := cmd.CombinedOutput()
log.Debugf("Exec output: %v", string(out))
if err != nil {
log.Errorf("Faile to scp NF: neType=%s, neId=%s, ip=%s", neType, neId, neInfo.Ip)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
// backup system.ini to system.ini.bak
sshHost := fmt.Sprintf("%s@%s", config.GetYamlConfig().NE.User, neInfo.Ip)
cpCmd := fmt.Sprintf("sudo test -f %s/system.ini && cp -f %s/system.ini %s/system.ini.bak||echo 0",
neLicensePath, neLicensePath, neLicensePath)
cmd = exec.Command("ssh", sshHost, cpCmd)
out, err = cmd.CombinedOutput()
log.Debugf("Exec output: %v", string(out))
if err != nil {
log.Errorf("Faile to execute cp command:%v, cmd:%s", err, cpCmd)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
// replace system.ini
neFilePath := config.GetYamlConfig().NE.ScpDir + "/" + licenseFileName
cpCmd = fmt.Sprintf("sudo mv -f %s %s/system.ini", neFilePath, neLicensePath)
cmd = exec.Command("ssh", sshHost, cpCmd)
out, err = cmd.CombinedOutput()
log.Debugf("Exec output: %v", string(out))
if err != nil {
log.Error("Faile to execute cp 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,
// Status: "ACTIVE",
// Path: licensePath,
// FileName: licenseFileName,
// Comment: comment,
// }
// log.Debug("neLicense:", neLicense)
// _, err = dborm.XormInsertTableOne("ne_license", neLicense)
// if err != nil {
// log.Error("Faile to XormInsertTableOne:", err)
// services.ResponseInternalServerError500ProcessError(w, err)
// }
neLicense := neModel.NeLicense{
NeType: neTypeUpper,
NeId: neId,
Status: "0",
LicensePath: neFilePath,
Remark: comment,
}
log.Debug("neLicense:", neLicense)
// 检查是否存在授权记录
neLicense2 := neService.NewNeLicenseImpl.SelectByNeTypeAndNeID(neTypeUpper, neId)
if neLicense2.NeId != neId {
// 读取授权码
code, _ := neService.NewNeLicenseImpl.ReadLicenseInfo(neLicense)
neLicense.ActivationRequestCode = code
neLicense.CreateBy = ctx.LoginUserToUserName(r)
insertId := neService.NewNeLicenseImpl.Insert(neLicense)
if insertId != "" {
services.ResponseStatusOK204NoContent(w)
return
}
} else {
neLicense2.UpdateBy = ctx.LoginUserToUserName(r)
upRows := neService.NewNeLicenseImpl.Update(neLicense2)
if upRows > 0 {
services.ResponseStatusOK204NoContent(w)
return
}
}
services.ResponseInternalServerError500ProcessError(w, err)
}

26
features/cm/ne.go
View File

@@ -10,13 +10,13 @@ import (
"strings"
"time"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
tokenConst "nms_cxy/src/framework/constants/token"
neService "nms_cxy/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"
@@ -157,7 +157,7 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
}
// 刷新缓存，不存在结构体网元Id空字符串
neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
mapRow := make(map[string]interface{})
row := map[string]interface{}{"affectedRows": affected}
@@ -208,7 +208,7 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
}
// 刷新缓存，不存在结构体网元Id空字符串
neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
services.ResponseStatusOK204NoContent(w)
return
@@ -267,7 +267,7 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
}
// 刷新缓存，不存在结构体网元Id空字符串
neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
mapRow := make(map[string]interface{})
row := map[string]interface{}{"affectedRows": affected}
@@ -319,7 +319,7 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
}
// 刷新缓存，不存在结构体网元Id空字符串
neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
services.ResponseStatusOK204NoContent(w)
return
@@ -381,7 +381,7 @@ func DeleteNeInfo(w http.ResponseWriter, r *http.Request) {
}
// 刷新缓存，不存在结构体网元Id空字符串
neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
mapRow := make(map[string]interface{})
row := map[string]interface{}{"affectedRows": affected}
@@ -862,7 +862,7 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
// send 204 to fe firstly
services.ResponseStatusOK204NoContent(w)
//actionCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh %s", config.GetYamlConfig().NE.OmcDir, action)
actionCmd := fmt.Sprintf("sudo systemctl %s omc", action)
actionCmd := fmt.Sprintf("sudo systemctl %s restagent", action)
go RunSSHCmd(sshHost, actionCmd)
return
// cmd := exec.Command("ssh", sshHost, actionCmd)

46
features/cm/omc/controller.go Normal file
View File

@@ -0,0 +1,46 @@
package cm_omc
import (
"fmt"
"net/http"
"be.ems/lib/services"
"github.com/gin-gonic/gin"
)
func (o *ConfigOMC) Get(c *gin.Context) {
paramName := c.Param("paramName")
results, err := o.Query(paramName)
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
c.JSON(http.StatusOK, services.DataResp(results))
}
func (o *ConfigOMC) Post(c *gin.Context) {
err := fmt.Errorf("method not allowed")
c.JSON(http.StatusMethodNotAllowed, services.ErrResp(err.Error()))
}
func (o *ConfigOMC) Put(c *gin.Context) {
paramName := c.Param("paramName")
var paramData map[string]any
if err := c.ShouldBindJSON(&paramData); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
return
}
result, err := o.Modify(paramName, paramData)
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
c.JSON(http.StatusOK, services.DataResp(result))
}
func (o *ConfigOMC) Delete(c *gin.Context) {
err := fmt.Errorf("method not allowed")
c.JSON(http.StatusMethodNotAllowed, services.ErrResp(err.Error()))
}

69
features/cm/omc/implement.go Normal file
View File

@@ -0,0 +1,69 @@
package cm_omc
import (
"fmt"
"be.ems/restagent/config"
)
const (
PASSWORD_MASK = "********"
)
func (o *ConfigOMC) Query(paramName string) (any, error) {
var results []any
switch paramName {
case "alarmEmailForward":
result := config.GetYamlConfig().Alarm.EmailForward
result.Password = PASSWORD_MASK
results = append(results, result)
case "alarmSMSForward":
result := config.GetYamlConfig().Alarm.SMSCForward
result.Password = PASSWORD_MASK
results = append(results, result)
default:
return nil, fmt.Errorf("invalid source parameter")
}
return results, nil
}
func (o *ConfigOMC) Add() {
}
func (o *ConfigOMC) Modify(paramName string, paramData map[string]any) (any, error) {
var results []any
switch paramName {
case "alarmEmailForward":
param := &(config.GetYamlConfig().Alarm.EmailForward)
config.UpdateStructFromMap(param, paramData)
result := *param
results = append(results, result)
err := config.WriteOrignalConfig(config.YamlConfigInfo.FilePath, paramName, paramData)
if err != nil {
fmt.Println("failed to write config yaml file:", err)
return results, err
}
case "alarmSMSForward":
param := &(config.GetYamlConfig().Alarm.SMSCForward)
config.UpdateStructFromMap(param, paramData)
result := *param
results = append(results, result)
err := config.WriteOrignalConfig(config.YamlConfigInfo.FilePath, paramName, paramData)
if err != nil {
fmt.Println("failed to write config yaml file:", err)
return results, err
}
default:
return nil, fmt.Errorf("invalid source parameter")
}
return results, nil
}
func (o *ConfigOMC) Remove() {
}

26
features/cm/omc/model.go Normal file
View File

@@ -0,0 +1,26 @@
package cm_omc
type ConfigOMC struct{}
type SystemConfig struct {
ForwardFlag bool `json:"forwardFlag"`
}
type AlarmEmailForward struct {
Enable bool `json:"enable"`
EmailList string `json:"emailList"`
SMTP string `json:"smtp"`
Port uint16 `json:"port"`
User string `json:"user"`
Password string `json:"password"`
TLSSkipVerify bool `json:"tlsSkipVerify"`
}
type AlarmSMSForward struct {
Enable bool `json:"enable"`
MobileList string `json:"mobileList"`
SMSCAddr string `json:"smscAddr"`
SystemID string `json:"systemID"`
Password string `json:"password"`
SystemType string `json:"systemType"`
}

30
features/cm/omc/route.go Normal file
View File

@@ -0,0 +1,30 @@
package cm_omc
import (
"be.ems/src/framework/middleware"
"github.com/gin-gonic/gin"
)
// Register Routes for file_export
func Register(r *gin.RouterGroup) {
cmOMC := r.Group("/omc")
{
var o *ConfigOMC
cmOMC.GET("/config/:paramName",
middleware.PreAuthorize(nil),
o.Get,
)
cmOMC.POST("/config/:paramName",
middleware.PreAuthorize(nil),
o.Post,
)
cmOMC.PUT("/config/:paramName",
middleware.PreAuthorize(nil),
o.Put,
)
cmOMC.DELETE("/config/:paramName",
middleware.PreAuthorize(nil),
o.Delete,
)
}
}

20
features/cm/param.go
View File

@@ -3,18 +3,18 @@ package cm
import (
"strings"
"nms_cxy/lib/core/ctx"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/core/ctx"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
"encoding/json"
"fmt"
"io"
"net/http"
neService "nms_cxy/src/modules/network_element/service"
neService "be.ems/src/modules/network_element/service"
"github.com/go-resty/resty/v2"
"github.com/gorilla/mux"
@@ -39,7 +39,7 @@ func GetParamConfigFromNF(w http.ResponseWriter, r *http.Request) {
return
}
neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
var response services.DataResponse
if neInfo.NeId == neId && neInfo.NeId != "" {
@@ -76,7 +76,7 @@ func PostParamConfigToNF(w http.ResponseWriter, r *http.Request) {
return
}
neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
if neInfo.NeId != neId || neInfo.NeId == "" {
log.Error("neId is empty")
@@ -128,7 +128,7 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) {
}
neId := ctx.GetQuery(r, "ne_id")
neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
if neInfo.NeId != neId || neInfo.NeId == "" {
log.Error("neId is empty")
@@ -181,7 +181,7 @@ func DeleteParamConfigToNF(w http.ResponseWriter, r *http.Request) {
}
neId := ctx.GetQuery(r, "ne_id")
neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
if neInfo.NeId != neId || neInfo.NeId == "" {
log.Error("neId is empty")

17
features/cm/service.go Normal file
View File

@@ -0,0 +1,17 @@
package cm
import (
cm_omc "be.ems/features/cm/omc"
"be.ems/lib/log"
"github.com/gin-gonic/gin"
)
func InitSubServiceRoute(r *gin.Engine) {
log.Info("======init PM group gin.Engine")
cmGroup := r.Group("/cm")
// register sub modules routes
cm_omc.Register(cmGroup)
// return featuresGroup
}

10
features/cm/software.go
View File

@@ -10,11 +10,11 @@ import (
"strconv"
"strings"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/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"
)

11
features/dbrest/backup.go
View File

@@ -10,12 +10,11 @@ import (
"path/filepath"
"time"
"nms_cxy/lib/core/conf"
"nms_cxy/lib/dborm"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/core/conf"
"be.ems/lib/dborm"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
_ "github.com/go-sql-driver/mysql"
)

12
features/dbrest/dbrest.go
View File

@@ -9,12 +9,12 @@ import (
"strings"
"time"
"nms_cxy/lib/core/ctx"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/core/ctx"
"be.ems/lib/dborm"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
"github.com/gorilla/mux"
"xorm.io/xorm"

23
features/event/event.go
View File

@@ -8,15 +8,14 @@ import (
"strings"
"time"
"nms_cxy/lib/core/ctx"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
neService "nms_cxy/src/modules/network_element/service"
wsService "nms_cxy/src/modules/ws/service"
"be.ems/lib/core/ctx"
"be.ems/lib/dborm"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
neService "be.ems/src/modules/network_element/service"
wsService "be.ems/src/modules/ws/service"
"github.com/gin-gonic/gin"
)
@@ -75,7 +74,7 @@ func PostUEEventFromAMF(c *gin.Context) {
// AMF没有RmUID，直接推送
// 推送到ws订阅组
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_AMF_UE, ueEvent)
wsService.NewWSSend.ByGroupID(wsService.GROUP_AMF_UE, ueEvent)
services.ResponseStatusOK204NoContent(c.Writer)
}
@@ -100,11 +99,11 @@ func PostUEEvent(w http.ResponseWriter, r *http.Request) {
}
// 发送到匹配的网元
neInfo := neService.NewNeInfoImpl.SelectNeInfoByRmuid(ueEvent.RmUID)
neInfo := neService.NewNeInfo.SelectNeInfoByRmuid(ueEvent.RmUID)
if neInfo.RmUID == ueEvent.RmUID {
// 推送到ws订阅组
if ueEvent.NeType == "MME" {
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_MME_UE+neInfo.NeId, ueEvent)
wsService.NewWSSend.ByGroupID(wsService.GROUP_MME_UE+neInfo.NeId, ueEvent)
}
}

14
features/features.go
View File

@@ -1,10 +1,11 @@
package features
import (
"nms_cxy/features/lm"
"nms_cxy/features/pm"
"nms_cxy/lib/log"
"be.ems/features/cm"
"be.ems/features/lm"
"be.ems/features/nbi"
"be.ems/features/pm"
"be.ems/lib/log"
"github.com/gin-gonic/gin"
)
@@ -12,9 +13,10 @@ func InitServiceEngine(r *gin.Engine) {
log.Info("======init feature group gin.Engine")
// featuresGroup := r.Group("/")
// 注册 各个features 模块的路由
// register features routers
pm.InitSubServiceRoute(r)
lm.InitSubServiceRoute(r)
cm.InitSubServiceRoute(r)
nbi.InitSubServiceRoute(r)
// return featuresGroup
}

7
features/file/file.go
View File

@@ -4,10 +4,9 @@ import (
"net/http"
"path/filepath"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
"github.com/gorilla/mux"
)

21
features/fm/alarm.go
View File

@@ -10,12 +10,11 @@ import (
"strings"
"time"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/dborm"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
"xorm.io/xorm"
"github.com/go-resty/resty/v2"
@@ -467,10 +466,12 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
}
session.Commit()
}
if config.GetYamlConfig().Alarm.ForwardAlarm {
if config.GetYamlConfig().Alarm.EmailForward.Enable {
if err = AlarmEmailForward(&alarmData); err != nil {
log.Error("Failed to AlarmEmailForward:", err)
}
}
if config.GetYamlConfig().Alarm.SMSCForward.Enable {
if err = AlarmSMSForward(&alarmData); err != nil {
log.Error("Failed to AlarmSMSForward:", err)
}
@@ -594,7 +595,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
exist, err := session.Table("alarm").
Where("ne_type=? and ne_id=? and alarm_id=? and alarm_status=1", alarmData.NeType, alarmData.NeId, alarmData.AlarmId).
Exist()
if err == nil || !exist {
if err != nil || !exist {
log.Infof("Not found active alarm: ne_id=%s, alarm_id=%s", alarmData.NeId, alarmData.AlarmId)
continue
}
@@ -777,10 +778,12 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
continue
}
session.Commit()
if config.GetYamlConfig().Alarm.ForwardAlarm {
if config.GetYamlConfig().Alarm.EmailForward.Enable {
if err = AlarmEmailForward(&alarmData); err != nil {
log.Error("Failed to AlarmEmailForward:", err)
}
}
if config.GetYamlConfig().Alarm.SMSCForward.Enable {
if err = AlarmSMSForward(&alarmData); err != nil {
log.Error("Failed to AlarmSMSForward:", err)
}

41
features/fm/email.go
View File

@@ -2,13 +2,12 @@ package fm
import (
"crypto/tls"
"errors"
"fmt"
"strings"
"nms_cxy/lib/dborm"
"nms_cxy/lib/log"
"nms_cxy/omc/config"
"be.ems/lib/dborm"
"be.ems/lib/log"
"be.ems/restagent/config"
"gopkg.in/gomail.v2"
)
@@ -48,25 +47,25 @@ func AlarmEmailForward(alarmData *Alarm) error {
// userName := "smtpext@agrandtech.com"
// password := "1000smtp@omc!"
host := config.GetYamlConfig().Alarm.Email.Smtp
port := int(config.GetYamlConfig().Alarm.Email.Port)
userName := config.GetYamlConfig().Alarm.Email.User
password := config.GetYamlConfig().Alarm.Email.Password
host := config.GetYamlConfig().Alarm.EmailForward.SMTP
port := int(config.GetYamlConfig().Alarm.EmailForward.Port)
userName := config.GetYamlConfig().Alarm.EmailForward.User
password := config.GetYamlConfig().Alarm.EmailForward.Password
m := gomail.NewMessage()
m.SetHeader("From", userName) // 发件人
//m.SetHeader("From", "alias"+"<"+"aliastest"+">") // 增加发件人别名
emails, err := dborm.XormGetAlarmForward("Email")
if err != nil {
log.Error("Failed to XormGetAlarmForward:", err)
return err
} else if emails == nil || len(*emails) == 0 {
err := errors.New("not found forward email list")
log.Error(err)
return err
}
// emails, err := dborm.XormGetAlarmForward("Email")
// if err != nil {
// log.Error("Failed to XormGetAlarmForward:", err)
// return err
// } else if emails == nil || len(*emails) == 0 {
// err := errors.New("not found forward email list")
// log.Error(err)
// return err
// }
emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",")
forwardLog := &dborm.AlarmForwardLog{
NeType: alarmData.NeType,
NeID: alarmData.NeId,
@@ -74,10 +73,10 @@ func AlarmEmailForward(alarmData *Alarm) error {
AlarmTitle: alarmData.AlarmTitle,
AlarmSeq: alarmData.AlarmSeq,
EventTime: alarmData.EventTime,
ToUser: strings.Join(*emails, ","),
ToUser: config.GetYamlConfig().Alarm.EmailForward.EmailList,
}
m.SetHeader("To", *emails...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
m.SetHeader("To", emails...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
//m.SetHeader("To", strings.Join(*emails, " ")) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
//m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
//m.SetHeader("Cc", "******@qq.com") // 抄送，可以多个
@@ -103,7 +102,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
)
// 关闭SSL协议认证
d.TLSConfig = &tls.Config{InsecureSkipVerify: true}
if !config.GetYamlConfig().Alarm.Email.TlsSkipVerify {
if !config.GetYamlConfig().Alarm.EmailForward.TLSSkipVerify {
// 打开SSL协议认证
d.TLSConfig = &tls.Config{InsecureSkipVerify: false}
}

141
features/fm/smsforward.go
View File

@@ -8,10 +8,9 @@ import (
"strings"
"time"
"nms_cxy/lib/dborm"
"nms_cxy/lib/log"
"nms_cxy/omc/config"
"be.ems/lib/dborm"
"be.ems/lib/log"
"be.ems/restagent/config"
"github.com/linxGnu/gosmpp"
"github.com/linxGnu/gosmpp/data"
"github.com/linxGnu/gosmpp/pdu"
@@ -91,36 +90,24 @@ func AlarmForwardBySMS(alarmData *Alarm) (string, error) {
case http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusCreated:
return userList, nil
default:
err := fmt.Errorf("Failed to send SMS: %s(Code=%d)", resp.Status, resp.StatusCode)
log.Error(err)
log.Error(fmt.Errorf("failed to send SMS: %s(Code=%d)", resp.Status, resp.StatusCode))
return userList, err
}
}
var smsForward = &(config.GetYamlConfig().Alarm.SMSCForward)
func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
log.Info("AlarmForwardBySMPP processing... ")
toUsers, err := dborm.XormGetAlarmForward("SMS")
if err != nil {
log.Error("Failed to XormGetAlarmForward:", err)
return "", err
} else if toUsers == nil {
err := errors.New("not found forward phone number")
log.Error(err)
return "", err
}
userList := strings.Join(*toUsers, ",")
userList := smsForward.MobileList
auth := gosmpp.Auth{
SMSC: config.GetYamlConfig().Alarm.SMSC.Addr,
SystemID: config.GetYamlConfig().Alarm.SMSC.SystemID,
Password: config.GetYamlConfig().Alarm.SMSC.Password,
SystemType: config.GetYamlConfig().Alarm.SMSC.SystemType,
SMSC: smsForward.SMSCAddr,
SystemID: smsForward.SystemID,
Password: smsForward.Password,
SystemType: smsForward.SystemType,
}
// conn, err := gosmpp.NonTLSDialer(auth.SMSC)
// connection := gosmpp.NewConnection(conn)
trans, err := gosmpp.NewSession(
gosmpp.TXConnector(gosmpp.NonTLSDialer, auth),
gosmpp.Settings{
@@ -150,17 +137,22 @@ func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
_ = trans.Close()
}()
// sending SMS(s)
// var results []string
// for _, toUser := range *toUsers {
message := "Alarm Notification: " + alarmData.AlarmTitle + " from " + alarmData.NeType + " " + alarmData.NeId + " at " + alarmData.EventTime
if err = trans.Transceiver().Submit(newSubmitSM(userList, message)); err != nil {
// result := fmt.Sprintf("Failed to submit %s hort message:%s", toUser, err.Error())
// results = append(results, result)
log.Error("Failed to submit hort message:", err)
return userList, err
message := "Alarm Notification: " + alarmData.AlarmTitle + " from " + alarmData.NeType + "_" + alarmData.NeId + " at " + alarmData.EventTime
for _, user := range strings.Split(userList, ",") {
sm, err := newSubmitSM(user, message)
if err != nil {
log.Errorf("Failed to newSubmitSM %s short message: %v", user, err)
writeLog(alarmData, user, "SMS", err)
continue
}
if err = trans.Transceiver().Submit(sm); err != nil {
log.Errorf("Failed to Submit %s short message: %v", user, err)
writeLog(alarmData, user, "SMS", err)
continue
}
writeLog(alarmData, user, "SMS", nil)
}
// }
return userList, nil
}
@@ -191,61 +183,58 @@ func writeLog(alarmData *Alarm, toUser, forwardBy string, err error) error {
return nil
}
func handlePDU() func(pdu.PDU) (pdu.PDU, bool) {
return func(p pdu.PDU) (pdu.PDU, bool) {
switch pd := p.(type) {
case *pdu.Unbind:
log.Trace("Unbind Received")
return pd.GetResponse(), true
case *pdu.UnbindResp:
log.Trace("UnbindResp Received")
case *pdu.SubmitSMResp:
log.Trace("SubmitSMResp Received")
case *pdu.GenericNack:
log.Trace("GenericNack Received")
case *pdu.EnquireLinkResp:
fmt.Println("EnquireLinkResp Received")
case *pdu.EnquireLink:
log.Trace("EnquireLink Received")
return pd.GetResponse(), false
case *pdu.DataSM:
log.Trace("DataSM receiver")
return pd.GetResponse(), false
case *pdu.DeliverSM:
log.Trace("DeliverSM receiver")
return pd.GetResponse(), false
}
return nil, false
}
}
func newSubmitSM(phoneNumber string, message string) *pdu.SubmitSM {
func newSubmitSM(phoneNumber string, message string) (*pdu.SubmitSM, error) {
// build up submitSM
srcAddr := pdu.NewAddress()
srcAddr.SetTon(5)
srcAddr.SetNpi(0)
_ = srcAddr.SetAddress("alarm notification:")
err := srcAddr.SetAddress(smsForward.ServiceNumber)
if err != nil {
return nil, err
}
destAddr := pdu.NewAddress()
destAddr.SetTon(1)
destAddr.SetNpi(1)
_ = destAddr.SetAddress(phoneNumber)
err = destAddr.SetAddress(phoneNumber)
if err != nil {
return nil, err
}
submitSM := pdu.NewSubmitSM().(*pdu.SubmitSM)
submitSM.SourceAddr = srcAddr
submitSM.DestAddr = destAddr
_ = submitSM.Message.SetMessageWithEncoding(message, data.UCS2)
dataCoding := data.FromDataCoding(smsForward.DataCoding)
err = submitSM.Message.SetMessageWithEncoding(message, dataCoding)
if err != nil {
return nil, err
}
submitSM.ProtocolID = 0
submitSM.RegisteredDelivery = 1
submitSM.ReplaceIfPresentFlag = 0
submitSM.EsmClass = 0
return submitSM
return submitSM, nil
}
// const (
// // Short message data coding type
// SMS_CODING_GSM7BIT byte = iota
// SMS_CODING_ASCII
// SMS_CODING_BINARY8BIT1
// SMS_CODING_LATIN1
// SMS_CODING_BINARY8BIT2
// SMS_CODING_NODEF
// SMS_CODING_CYRILLIC
// SMS_CODING_HEBREW
// SMS_CODING_UCS2
// )
// var codingMap = map[byte]data.Encoding{
// SMS_CODING_GSM7BIT: data.GSM7BIT,
// SMS_CODING_ASCII: data.ASCII,
// SMS_CODING_BINARY8BIT1: data.BINARY8BIT1,
// SMS_CODING_LATIN1: data.LATIN1,
// SMS_CODING_BINARY8BIT2: data.BINARY8BIT2,
// SMS_CODING_CYRILLIC: data.CYRILLIC,
// SMS_CODING_HEBREW: data.HEBREW,
// SMS_CODING_UCS2: data.UCS2,
// }

14
features/handle/handle.go
View File

@@ -8,17 +8,17 @@ import (
"strconv"
"strings"
"nms_cxy/lib/dborm"
"be.ems/lib/dborm"
"github.com/gorilla/mux"
g "github.com/gosnmp/gosnmp"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/oauth"
"nms_cxy/lib/services"
"nms_cxy/lib/session"
"nms_cxy/omc/config"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/oauth"
"be.ems/lib/services"
"be.ems/lib/session"
"be.ems/restagent/config"
)
var TodoList []stTodo

34
features/lm/file_export/controller.go
View File

@@ -6,13 +6,12 @@ import (
"os"
"path/filepath"
"nms_cxy/lib/file"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/src/framework/datasource"
"nms_cxy/src/framework/i18n"
"nms_cxy/src/framework/utils/ctx"
"be.ems/lib/file"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/src/framework/datasource"
"be.ems/src/framework/i18n"
"be.ems/src/framework/utils/ctx"
"github.com/gin-gonic/gin"
)
@@ -39,7 +38,7 @@ func (m *SysJob) GetFileExportTable(c *gin.Context) {
err := datasource.DefaultDB().Table(m.TableName()).Where("invoke_target=? and status=1", INVOKE_FILE_EXPORT).
Find(&results).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
language := ctx.AcceptLanguage(c)
@@ -47,7 +46,7 @@ func (m *SysJob) GetFileExportTable(c *gin.Context) {
for _, job := range results {
var params TargetParams
if err := json.Unmarshal([]byte(job.TargetParams), &params); err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
TableDisplay := i18n.TKey(language, "table."+params.TableName)
@@ -68,14 +67,15 @@ func (m *FileExport) GetFileList(c *gin.Context) {
var querys FileExportQuery
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
files, err := file.GetFileInfo(querys.Path, querys.Suffix)
if err != nil {
log.Error(err)
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
log.Error("failed to GetFileInfo:", err)
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
// split files list
@@ -99,8 +99,8 @@ func (m *FileExport) Total(c *gin.Context) {
fileCount, dirCount, err := file.GetFileAndDirCount(dir)
if err != nil {
log.Error(err)
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
log.Error("failed to GetFileAndDirCount:", err)
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
total := fileCount + dirCount
@@ -114,13 +114,13 @@ func (m *FileExport) DownloadHandler(c *gin.Context) {
file, err := os.Open(filePath)
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
defer file.Close()
if _, err := os.Stat(filePath); os.IsNotExist(err) {
c.JSON(http.StatusNotFound, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -135,7 +135,7 @@ func (m *FileExport) Delete(c *gin.Context) {
filePath := filepath.Join(dir, fileName)
if err := os.Remove(filePath); err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
c.JSON(http.StatusNoContent, nil) // 204 No Content

2
features/lm/file_export/model.go
View File

@@ -1,7 +1,7 @@
package file_export
import (
"nms_cxy/lib/file"
"be.ems/lib/file"
)
const (

3
features/lm/file_export/route.go
View File

@@ -1,8 +1,7 @@
package file_export
import (
"nms_cxy/src/framework/middleware"
"be.ems/src/framework/middleware"
"github.com/gin-gonic/gin"
)

8
features/lm/logbak.go
View File

@@ -6,10 +6,10 @@ import (
"os/exec"
"time"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
"github.com/gorilla/mux"
"xorm.io/xorm"

5
features/lm/service.go
View File

@@ -3,9 +3,8 @@
package lm
import (
"nms_cxy/features/lm/file_export"
"nms_cxy/lib/log"
"be.ems/features/lm/file_export"
"be.ems/lib/log"
"github.com/gin-gonic/gin"
)

973
features/mml/mml.go
View File

File diff suppressed because it is too large Load Diff

257
features/nbi/file/controller.go Normal file
View File

@@ -0,0 +1,257 @@
package nbi_file
import (
"archive/zip"
"fmt"
"io"
"net/http"
"os"
"path/filepath"
"time"
"be.ems/lib/dborm"
"be.ems/lib/file"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/services"
"github.com/gin-gonic/gin"
)
type SysJobResponse struct {
SysJob
TableName string `json:"tableName"`
TableDisplay string `json:"tableDisplay"`
FilePath string `json:"filePath"`
}
type TargetParams struct {
Duration int `json:"duration"`
TableName string `json:"tableName"`
Columns string `json:"columns"` // exported column name of time string
TimeCol string `json:"timeCol"` // time stamp of column name
TimeUnit string `json:"timeUnit"` // timestamp unit: second/micro/milli
Extras string `json:"extras"` // extras condition for where
FilePath string `json:"filePath"` // file path
}
func (m *FileNBI) GetFileList(c *gin.Context) {
var querys FileNBIQuery
querys.Category = c.Param("category")
querys.Type = c.Param("type")
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
if querys.Path == "" {
tableName := ""
ok := false
switch querys.Category {
case "cdr":
tableName, ok = CDRTableMapper[querys.Type]
if tableName == "" || !ok {
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid CDR file type: %s", querys.Type)))
return
}
case "log":
tableName, ok = LogTableMapper[querys.Type]
if tableName == "" || !ok {
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid log file type: %s", querys.Type)))
return
}
default:
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid log file category: %s", querys.Category)))
return
}
s := SysJob{}
where := fmt.Sprintf("invoke_target='%s' and status=1 and JSON_UNQUOTE(JSON_EXTRACT(target_params,'$.tableName'))='%s'", INVOKE_FILE_EXPORT, tableName)
_, err := dborm.XEngDB().Table(s.TableName()).
Select("JSON_UNQUOTE(JSON_EXTRACT(target_params, '$.filePath')) as file_path").
Where(where).
Get(&querys.Path)
if err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
}
files, err := file.GetFileInfo(querys.Path, querys.Suffix)
if err != nil {
log.Error("failed to GetFileInfo:", err)
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
// split files list
lenNum := int64(len(files))
start := (querys.PageNum - 1) * querys.PageSize
end := start + querys.PageSize
var splitList []file.FileInfo
if start >= lenNum {
splitList = []file.FileInfo{}
} else if end >= lenNum {
splitList = files[start:]
} else {
splitList = files[start:end]
}
total := len(files)
c.JSON(http.StatusOK, services.TotalDataResp(splitList, total))
}
func (m *FileNBI) Total(c *gin.Context) {
dir := c.Query("path")
fileCount, dirCount, err := file.GetFileAndDirCount(dir)
if err != nil {
log.Error("failed to GetFileAndDirCount:", err)
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
total := fileCount + dirCount
c.JSON(http.StatusOK, services.TotalResp(int64(total)))
}
func (m *FileNBI) GetSingleFileHandler(c *gin.Context) {
var querys FileNBIQuery
querys.Category = c.Param("category")
querys.Type = c.Param("type")
querys.DateIndex = c.Param("dateIndex")
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
tableName := ""
if querys.Path == "" {
ok := false
switch querys.Category {
case "cdr":
tableName, ok = CDRTableMapper[querys.Type]
if tableName == "" || !ok {
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid CDR file type: %s", querys.Type)))
return
}
case "log":
tableName, ok = LogTableMapper[querys.Type]
if tableName == "" || !ok {
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid log file type: %s", querys.Type)))
return
}
default:
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid log file category: %s", querys.Category)))
return
}
s := SysJob{}
where := fmt.Sprintf("invoke_target='%s' and status=1 and JSON_UNQUOTE(JSON_EXTRACT(target_params,'$.tableName'))='%s'", INVOKE_FILE_EXPORT, tableName)
_, err := dborm.XEngDB().Table(s.TableName()).
Select("JSON_UNQUOTE(JSON_EXTRACT(target_params, '$.filePath')) as file_path").
Where(where).
Get(&querys.Path)
if err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
}
fileName := tableName + "_export_" + querys.DateIndex + "0000" + ".csv"
filePath := filepath.Join(querys.Path, fileName)
file, err := os.Open(filePath)
if err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
defer file.Close()
if _, err := os.Stat(filePath); os.IsNotExist(err) {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
c.Header("Content-Disposition", "attachment; filename="+fileName)
c.Header("Content-Type", "application/octet-stream")
c.File(filePath)
}
func (m *FileNBI) GetMultiFileHandler(c *gin.Context) {
var querys FileNBIQuery
querys.Category = c.Param("category")
querys.Type = c.Param("type")
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
tableName := ""
if querys.Path == "" {
ok := false
switch querys.Category {
case "cdr":
tableName, ok = CDRTableMapper[querys.Type]
if tableName == "" || !ok {
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid CDR file type: %s", querys.Type)))
return
}
case "log":
tableName, ok = LogTableMapper[querys.Type]
if tableName == "" || !ok {
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid log file type: %s", querys.Type)))
return
}
default:
c.JSON(http.StatusOK, services.ErrResp(fmt.Sprintf("invalid log file category: %s", querys.Category)))
return
}
s := SysJob{}
where := fmt.Sprintf("invoke_target='%s' and status=1 and JSON_UNQUOTE(JSON_EXTRACT(target_params,'$.tableName'))='%s'", INVOKE_FILE_EXPORT, tableName)
_, err := dborm.XEngDB().Table(s.TableName()).
Select("JSON_UNQUOTE(JSON_EXTRACT(target_params, '$.filePath')) as file_path").
Where(where).
Get(&querys.Path)
if err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
}
zipWriter := zip.NewWriter(c.Writer)
defer zipWriter.Close()
for _, fileName := range querys.FileNames {
filePath := filepath.Join(querys.Path, fileName)
file, err := os.Open(filePath)
if err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
defer file.Close()
if _, err := os.Stat(filePath); os.IsNotExist(err) {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
writer, err := zipWriter.Create(filepath.Base(fileName))
if err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
if _, err := io.Copy(writer, file); err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
}
zipFile := tableName + "_export_" + time.Now().Local().Format(global.DateData) + ".zip"
c.Header("Content-Disposition", "attachment; filename="+zipFile)
c.Header("Content-Type", "application/zip")
//c.File(filePath)
}

47
features/nbi/file/model.go Normal file
View File

@@ -0,0 +1,47 @@
package nbi_file
import (
"be.ems/lib/file"
)
const (
INVOKE_FILE_EXPORT = "exportTable"
)
var CDRTableMapper map[string]string = map[string]string{
"ims": "cdr_event_ims",
"smf": "cdr_event_smf",
"smsc": "cdr_event_smsc",
"sms": "cdr_event_smsc",
}
var LogTableMapper map[string]string = map[string]string{
"operate": "sys_log_operate",
"security": "sys_log_login",
"alarm": "alarm_log",
}
type SysJob struct {
JobID int64 `gorm:"column:job_id;primary_key;auto_increment" json:"job_id"` //任务ID
InvokeTarget string `gorm:"column:invoke_target" json:"invoke_target"` //调用目标字符串
TargetParams string `gorm:"column:target_params;type:json" json:"target_params,omitempty"` //调用目标传入参数
}
func (s *SysJob) TableName() string {
return "sys_job"
}
type FileNBI struct {
file.FileInfo
}
type FileNBIQuery struct {
Category string `form:"category" binding:"required"`
Type string `form:"type" binding:"required"`
DateIndex string `form:"dateIndex"`
Path string `json:"path" form:"path"`
FileNames []string `json:"fileName" form:"fileName"`
Suffix string `form:"suffix"`
PageNum int64 `form:"pageNum"`
PageSize int64 `form:"pageSize"`
}

26
features/nbi/file/route.go Normal file
View File

@@ -0,0 +1,26 @@
package nbi_file
import (
"be.ems/src/framework/middleware"
"github.com/gin-gonic/gin"
)
// Register Routes for file_export
func Register(r *gin.RouterGroup) {
fileNBI := r.Group("/file")
{
var f *FileNBI
fileNBI.GET("/:category/:type/list",
middleware.PreAuthorize(nil),
f.GetFileList,
)
fileNBI.GET("/:category/:type/:dateIndex",
middleware.PreAuthorize(nil),
f.GetSingleFileHandler,
)
fileNBI.GET("/:category/:type",
middleware.PreAuthorize(nil),
f.GetMultiFileHandler,
)
}
}

16
features/nbi/nbi.go
View File

@@ -6,18 +6,16 @@ import (
"net/http"
"strings"
"nms_cxy/lib/dborm"
"be.ems/lib/dborm"
"github.com/go-resty/resty/v2"
"github.com/gorilla/mux"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/oauth"
"nms_cxy/lib/services"
"nms_cxy/lib/session"
"nms_cxy/omc/config"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/oauth"
"be.ems/lib/services"
"be.ems/restagent/config"
)
type ErrorOAuthResponse struct {
@@ -36,7 +34,7 @@ type ApiResponse struct {
ResultMessage interface{}
}
var globalSession = session.NewSessManager("restagent")
//var globalSession = session.NewSessManager("restagent")
var (
MAX_RMUID_NUM int

16
features/nbi/service.go Normal file
View File

@@ -0,0 +1,16 @@
// log management package
package nbi
import (
nbi_file "be.ems/features/nbi/file"
"be.ems/lib/log"
"github.com/gin-gonic/gin"
)
func InitSubServiceRoute(r *gin.Engine) {
log.Info("======init North-Bound Interface group gin.Engine")
nbiGroup := r.Group("/nbi")
nbi_file.Register(nbiGroup)
}

42
features/nbi/snmp.go
View File

@@ -9,9 +9,9 @@ import (
"github.com/gorilla/mux"
g "github.com/gosnmp/gosnmp"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
)
func init() {
@@ -54,28 +54,28 @@ func GetNRMByUri(w http.ResponseWriter, r *http.Request) {
// error processing ...
// 401-1 response
token, ret := globalSession.IsCarriedToken(r)
if ret == false {
log.Error("AccessToken is not carried")
services.ResponseUnauthorized401AccessTokenNotCarried(w)
return
}
// token, ret := globalSession.IsCarriedToken(r)
// if ret == false {
// log.Error("AccessToken is not carried")
// services.ResponseUnauthorized401AccessTokenNotCarried(w)
// return
// }
// 401-2 response
if globalSession.IsValidToken(token) == false {
log.Error("AccessToken fails or does not exist")
services.ResponseUnauthorized401AccessTokenNotExist(w)
return
}
// if globalSession.IsValidToken(token) == false {
// log.Error("AccessToken fails or does not exist")
// services.ResponseUnauthorized401AccessTokenNotExist(w)
// return
// }
// response 403 Forbidden, permissions deny
// todo...
plist := globalSession.GetPermissionFromSession(token)
log.Debug("permission list:", plist)
if len(plist) == 0 || plist[0] == false {
log.Error("User permission deny")
services.ResponseForbidden403NotPermission(w)
return
}
// plist := globalSession.GetPermissionFromSession(token)
// log.Debug("permission list:", plist)
// if len(plist) == 0 || plist[0] == false {
// log.Error("User permission deny")
// services.ResponseForbidden403NotPermission(w)
// return
// }
vars := mux.Vars(r)
qeuryUri := vars["apiCategory"] + "/" + vars["elementTypeValue"] + "/" + vars["objectTypeValue"]

59
features/pm/kpi_c_report/controller.go
View File

@@ -5,9 +5,8 @@ import (
"net/http"
"strings"
"nms_cxy/lib/dborm"
"nms_cxy/lib/services"
"be.ems/lib/dborm"
"be.ems/lib/services"
"github.com/gin-gonic/gin"
)
@@ -41,13 +40,14 @@ func (k *KpiCReport) Get(c *gin.Context) {
return
}
if querys.StartTime != "" {
conditions = append(conditions, "created_at >= ?")
conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
params = append(params, querys.StartTime)
}
if querys.EndTime != "" {
conditions = append(conditions, "created_at <= ?")
conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
params = append(params, querys.EndTime)
}
conditions = append(conditions, "kpi_values != 'null'")
whereSql := ""
if len(conditions) > 0 {
@@ -71,7 +71,7 @@ func (k *KpiCReport) Get(c *gin.Context) {
//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err := dbg.Find(&reports).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
c.JSON(http.StatusOK, services.DataResp(reports))
@@ -84,7 +84,7 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
var querys KpiCReportQuery
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -93,7 +93,7 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
conditions = append(conditions, "ne_type = ?")
params = append(params, strings.ToUpper(querys.NeType))
} else {
c.JSON(http.StatusBadRequest, services.ErrResp("Not found required parameter NE type"))
c.JSON(http.StatusOK, services.ErrResp("Not found required parameter NE type"))
return
}
tableName := TableName() + "_" + strings.ToLower(querys.NeType)
@@ -107,13 +107,14 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
return
}
if querys.StartTime != "" {
conditions = append(conditions, "created_at >= ?")
conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
params = append(params, querys.StartTime)
}
if querys.EndTime != "" {
conditions = append(conditions, "created_at <= ?")
conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
params = append(params, querys.EndTime)
}
conditions = append(conditions, "kpi_values != 'null'")
whereSql := ""
if len(conditions) > 0 {
@@ -137,7 +138,7 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err := dbg.Find(&results).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -150,7 +151,7 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
"neName": *r.NeName,
"rmUID": *r.RmUID,
"startIndex": r.Index,
"timeGroup": r.Date[:10] + " " + *r.StartTime,
"timeGroup": r.Date[:10] + " " + *r.EndTime,
"createdAt": r.CreatedAt,
"granularity": r.Granularity,
}
@@ -170,7 +171,7 @@ func (k *KpiCReport) GetTotalList(c *gin.Context) {
var querys KpiCReportQuery
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -179,20 +180,21 @@ func (k *KpiCReport) GetTotalList(c *gin.Context) {
conditions = append(conditions, "ne_type = ?")
params = append(params, strings.ToUpper(querys.NeType))
} else {
c.JSON(http.StatusBadRequest, services.ErrResp("Not found NE type"))
c.JSON(http.StatusOK, services.ErrResp("Not found NE type"))
return
}
tableName := TableName() + "_" + strings.ToLower(querys.NeType)
dbg := dborm.DefaultDB().Table(tableName)
if querys.StartTime != "" {
conditions = append(conditions, "created_at >= ?")
conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
params = append(params, querys.StartTime)
}
if querys.EndTime != "" {
conditions = append(conditions, "created_at <= ?")
conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
params = append(params, querys.EndTime)
}
conditions = append(conditions, "kpi_values != 'null'")
whereSql := ""
if len(conditions) > 0 {
@@ -204,7 +206,7 @@ func (k *KpiCReport) GetTotalList(c *gin.Context) {
var total int64 = 0
err := dbg.Count(&total).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -225,7 +227,7 @@ func (k *KpiCReport) GetTotalList(c *gin.Context) {
//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err = dbg.Find(&reports).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -238,7 +240,7 @@ func (k *KpiCReport) Total(c *gin.Context) {
var querys KpiCReportQuery
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -247,20 +249,21 @@ func (k *KpiCReport) Total(c *gin.Context) {
conditions = append(conditions, "ne_type = ?")
params = append(params, strings.ToUpper(querys.NeType))
} else {
c.JSON(http.StatusBadRequest, services.ErrResp("Not found NE type"))
c.JSON(http.StatusOK, services.ErrResp("Not found NE type"))
return
}
tableName := TableName() + "_" + strings.ToLower(querys.NeType)
dbg := dborm.DefaultDB().Table(tableName)
if querys.StartTime != "" {
conditions = append(conditions, "created_at >= ?")
conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
params = append(params, querys.StartTime)
}
if querys.EndTime != "" {
conditions = append(conditions, "created_at <= ?")
conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
params = append(params, querys.EndTime)
}
conditions = append(conditions, "kpi_values != 'null'")
whereSql := ""
if len(conditions) > 0 {
@@ -270,7 +273,7 @@ func (k *KpiCReport) Total(c *gin.Context) {
var total int64 = 0
err := dbg.Count(&total).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -281,11 +284,11 @@ func (k *KpiCReport) Post(c *gin.Context) {
var report KpiCReport
if err := c.ShouldBindJSON(&report); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
if err := dborm.DefaultDB().Create(&report).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
c.JSON(http.StatusCreated, services.DataResp(report))
@@ -296,12 +299,12 @@ func (k *KpiCReport) Put(c *gin.Context) {
id := c.Param("id")
if err := dborm.DefaultDB().First(&report, id).Error; err != nil {
c.JSON(http.StatusNotFound, services.ErrResp("KPI report not found"))
c.JSON(http.StatusOK, services.ErrResp("custom indicator report not found"))
return
}
if err := c.ShouldBindJSON(&report); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
dborm.DefaultDB().Save(&report)
@@ -312,7 +315,7 @@ func (k *KpiCReport) Delete(c *gin.Context) {
id := c.Param("id")
if err := dborm.DefaultDB().Delete(&KpiCReport{}, id).Error; err != nil {
c.JSON(http.StatusNotFound, services.ErrResp("KPI report not found"))
c.JSON(http.StatusOK, services.ErrResp("custom indicator report not found"))
return
}

22
features/pm/kpi_c_report/model.go
View File

@@ -30,17 +30,16 @@ type KpiCReport struct {
}
type KpiCReportQuery struct {
NeType string `json:"neType" form:"neType" binding:"required"`
NeID string `json:"neId" form:"neId" binding:"required"`
RmUID string `json:"rmUID" form:"rmUID"`
StartTime string `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"`
TenantName string `json:"tenantName" form:"tenantName"`
UserName string `json:"userName" form:"userName"`
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
PageNum int `json:"pageNum" form:"pageNum"`
PageSize int `json:"pageSize" form:"pageSize"`
NeType string `json:"neType" form:"neType" binding:"required"`
NeID string `json:"neId" form:"neId" binding:"required"`
RmUID string `json:"rmUID" form:"rmUID"`
StartTime string `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"`
UserName string `json:"userName" form:"userName"`
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
PageNum int `json:"pageNum" form:"pageNum"`
PageSize int `json:"pageSize" form:"pageSize"`
}
type KpiCReport2FE struct {
@@ -51,7 +50,6 @@ type KpiCReport2FE struct {
TimeGroup string `json:"timeGroup"`
StartIndex int16 `json:"startIndex" gorm:"column:index"`
Granularity int8 `json:"granularity" gorm:"column:granularity"`
TenantID string `json:"tenantID" gorm:"column:tenant_id"`
}
func TableName() string {

3
features/pm/kpi_c_report/route.go
View File

@@ -1,8 +1,7 @@
package kpi_c_report
import (
"nms_cxy/src/framework/middleware"
"be.ems/src/framework/middleware"
"github.com/gin-gonic/gin"
)

102
features/pm/kpi_c_title/controller.go
View File

@@ -3,22 +3,27 @@ package kpi_c_title
import (
"fmt"
"net/http"
"regexp"
"strconv"
"strings"
"nms_cxy/lib/dborm"
"nms_cxy/lib/services"
"be.ems/lib/dborm"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/src/framework/utils/ctx"
"github.com/gin-gonic/gin"
)
// get customize kpi total and list
func (k *KpiCTitle) GetToalList(c *gin.Context) {
var titles []KpiCTitle
var conditions []string
var params []any
i18n := ctx.AcceptLanguage(c)
var querys KpiCTitleQuery
if err := c.ShouldBindQuery(&querys); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -41,7 +46,7 @@ func (k *KpiCTitle) GetToalList(c *gin.Context) {
// Get total number
var total int64 = 0
if err := dbg.Count(&total).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -59,10 +64,12 @@ func (k *KpiCTitle) GetToalList(c *gin.Context) {
dbg = dbg.Order(orderBy)
}
if err := dbg.Find(&titles).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
k.expressionAlias(titles, i18n)
c.JSON(http.StatusOK, services.TotalDataResp(titles, total))
//c.JSON(http.StatusOK, titles)
}
@@ -71,6 +78,7 @@ func (k *KpiCTitle) Get(c *gin.Context) {
var titles []KpiCTitle
var conditions []string
var params []any
i18n := ctx.AcceptLanguage(c)
// construct condition to get
if neType := c.Query("neType"); neType != "" {
@@ -86,14 +94,42 @@ func (k *KpiCTitle) Get(c *gin.Context) {
whereSql += strings.Join(conditions, " and ")
}
if err := dborm.DefaultDB().Where(whereSql, params...).Find(&titles).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
k.expressionAlias(titles, i18n)
c.JSON(http.StatusOK, services.DataResp(titles))
//c.JSON(http.StatusOK, titles)
}
// alias customized kpi expression with cn/en title
func (k *KpiCTitle) expressionAlias(titles []KpiCTitle, i18n string) {
var title *KpiCTitle
for i := 0; i < len(titles); i++ {
title = &titles[i]
title.ExprAlias = *title.Expression
re := regexp.MustCompile(`'([^']+)'`)
matches := re.FindAllStringSubmatch(title.ExprAlias, -1)
for _, match := range matches {
var alias, sql string
if i18n == "zh" {
sql = fmt.Sprintf("SELECT cn_title FROM kpi_title WHERE kpi_id='%s'", match[1])
} else {
sql = fmt.Sprintf("SELECT en_title FROM kpi_title WHERE kpi_id='%s'", match[1])
}
err := dborm.XCoreDB().QueryRow(sql).Scan(&alias)
if err != nil {
log.Warn("Failed to QueryRow:", err)
continue
}
title.ExprAlias = regexp.MustCompile(match[1]).ReplaceAllString(title.ExprAlias, alias)
}
}
}
func (k *KpiCTitle) Total(c *gin.Context) {
var conditions []string
var params []any
@@ -113,7 +149,7 @@ func (k *KpiCTitle) Total(c *gin.Context) {
}
var total int64 = 0
if err := dborm.DefaultDB().Table(k.TableName()).Where(whereSql, params...).Count(&total).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
@@ -121,19 +157,47 @@ func (k *KpiCTitle) Total(c *gin.Context) {
}
func (k *KpiCTitle) Post(c *gin.Context) {
var title KpiCTitle
var title, res KpiCTitle
if err := c.ShouldBindJSON(&title); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
result := dborm.DefaultDB().Where("ne_type=? and kpi_id=?", title.NeType, title.KpiID).First(&title)
userName := ctx.LoginUserToUserName(c)
title.CreatedBy = &userName
result := dborm.DefaultDB().Where("ne_type=? and (kpi_id=? or title=?)", title.NeType, title.KpiID, title.Title).First(&title)
if result.RowsAffected > 0 {
c.JSON(http.StatusInternalServerError, services.ErrResp("target kpiC title already exist"))
c.JSON(http.StatusOK, services.ErrResp("custom indicator already exist"))
return
}
ret := dborm.DefaultDB().Table("kpi_c_title").Where("ne_type=? ORDER BY kpi_id DESC LIMIT 1", title.NeType).Scan(&res)
if err := ret.Error; err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
newKpiID := *title.NeType + ".C" + ".01"
if ret.RowsAffected != 0 {
maxKpiID := *res.KpiID
prefix := maxKpiID[:len(maxKpiID)-2]
suffix := maxKpiID[len(maxKpiID)-2:]
suffixInt, err := strconv.Atoi(suffix)
if err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
if suffixInt >= MAX_KPI_C_ID {
err := fmt.Errorf("exceed the max customized KPI ID")
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
suffixInt++
newSuffix := fmt.Sprintf("%02d", suffixInt)
newKpiID = prefix + newSuffix
}
title.KpiID = &newKpiID
if err := dborm.DefaultDB().Create(&title).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
kpiCReportTable := "kpi_c_report_" + strings.ToLower(*title.NeType)
@@ -141,17 +205,17 @@ func (k *KpiCTitle) Post(c *gin.Context) {
// clone table "kpi_c_report" to "kpi_c_report_{neType}"
sql := fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s AS SELECT * FROM %s WHERE 1=0", kpiCReportTable, "kpi_c_report")
if _, err := dborm.ExecSQL(sql, nil); err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
sql = fmt.Sprintf("ALTER TABLE %s MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`)", kpiCReportTable)
if _, err := dborm.ExecSQL(sql, nil); err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
sql = fmt.Sprintf("ALTER TABLE %s ADD INDEX IF NOT EXISTS `idx_timestamp`(`created_at`) USING BTREE, ADD INDEX IF NOT EXISTS `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE", kpiCReportTable)
if _, err := dborm.ExecSQL(sql, nil); err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
}
@@ -163,12 +227,12 @@ func (k *KpiCTitle) Put(c *gin.Context) {
id := c.Param("id")
if err := dborm.DefaultDB().First(&title, id).Error; err != nil {
c.JSON(http.StatusNotFound, services.ErrResp("KPIC Title not found"))
c.JSON(http.StatusOK, services.ErrResp("custom indicator not found"))
return
}
if err := c.ShouldBindJSON(&title); err != nil {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return
}
dborm.DefaultDB().Save(&title)
@@ -180,7 +244,7 @@ func (k *KpiCTitle) Delete(c *gin.Context) {
id := c.Param("id")
if err := dborm.DefaultDB().Delete(&KpiCTitle{}, id).Error; err != nil {
c.JSON(http.StatusNotFound, services.ErrResp("KPIC Title not found"))
c.JSON(http.StatusOK, services.ErrResp("custom indicator not found"))
return
}

5
features/pm/kpi_c_title/model.go
View File

@@ -2,12 +2,17 @@ package kpi_c_title
import "time"
const (
MAX_KPI_C_ID = 99
)
type KpiCTitle struct {
ID int `gorm:"column:id;primary_key;auto_increment" json:"id"`
NeType *string `gorm:"column:ne_type;default:NULL," json:"neType,omitempty"`
KpiID *string `gorm:"column:kpi_id;default:NULL," json:"kpiId,omitempty"`
Title *string `gorm:"column:title;default:NULL," json:"title,omitempty"`
Expression *string `gorm:"column:expression;default:NULL," json:"expression,omitempty"`
ExprAlias string `gorm:"-" json:"exprAlias"`
Status string `gorm:"column:status;default:'Active'" json:"status"`
Unit *string `gorm:"column:unit" json:"unit,omitempty"`
Description *string `gorm:"column:description;default:NULL," json:"description,omitempty"`

3
features/pm/kpi_c_title/route.go
View File

@@ -1,8 +1,7 @@
package kpi_c_title
import (
"nms_cxy/src/framework/middleware"
"be.ems/src/framework/middleware"
"github.com/gin-gonic/gin"
)

165
features/pm/performance.go
View File

@@ -10,18 +10,17 @@ import (
"strings"
"time"
"nms_cxy/features/pm/kpi_c_report"
"nms_cxy/features/pm/kpi_c_title"
"nms_cxy/lib/dborm"
evaluate "nms_cxy/lib/eval"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
neService "nms_cxy/src/modules/network_element/service"
wsService "nms_cxy/src/modules/ws/service"
"be.ems/features/pm/kpi_c_report"
"be.ems/features/pm/kpi_c_title"
"be.ems/lib/dborm"
evaluate "be.ems/lib/eval"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
neService "be.ems/src/modules/network_element/service"
wsService "be.ems/src/modules/ws/service"
"github.com/go-resty/resty/v2"
_ "github.com/go-sql-driver/mysql"
"github.com/gorilla/mux"
@@ -45,7 +44,7 @@ type KpiReport struct {
NeType string `json:"NeType"`
KPIs []struct {
KPIID string `json:"KPIID"`
Value int `json:"Value"`
Value int64 `json:"Value"`
Err string `json:"Err"`
} `json:"KPIs"`
} `json:"NE"`
@@ -63,7 +62,7 @@ type GoldKpi struct {
RmUid string `json:"rmUid" xorm:"rm_uid"`
NEType string `json:"neType" xorm:"ne_type"`
KpiId string `json:"kpiId" xorm:"kpi_id"`
Value int `json:"value"`
Value int64 `json:"value"`
Error string `json:"error"`
Timestamp string `json:"timestamp"`
}
@@ -289,7 +288,7 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
}
// 发送到匹配的网元
neInfo := neService.NewNeInfoImpl.SelectNeInfoByRmuid(kpiData.RmUid)
neInfo := neService.NewNeInfo.SelectNeInfoByRmuid(kpiData.RmUid)
// custom kpi report to FE
kpiCEvent := map[string]any{
// kip_id ...
@@ -298,7 +297,7 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
"neName": kpiData.NEName,
"rmUID": kpiData.RmUid,
"startIndex": kpiData.Index,
"timeGroup": kpiData.Date[:10] + " " + kpiData.StartTime,
"timeGroup": kpiData.Date[:10] + " " + kpiData.EndTime,
"createdAt": kpiData.CreatedAt,
"granularity": kpiData.Granularity,
}
@@ -325,147 +324,17 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
if neInfo.RmUID == kpiData.RmUid {
// 推送到ws订阅组
wsService.NewWSSendImpl.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
// 推送自定义KPI到ws订阅组
wsService.NewWSSendImpl.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent)
wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent)
if neInfo.NeType == "UPF" {
// 推送标识为：12_RMUID, exp: 12_4400HXUPF001
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF+kpiReport.Task.NE.RmUID, kpiEvent)
wsService.NewWSSend.ByGroupID(wsService.GROUP_KPI_UPF+neInfo.NeId, kpiEvent)
}
}
services.ResponseStatusOK204NoContent(w)
}
// PostGoldKPIFromNF 已废弃
// post kpi report from NEs, insert insto gold_kpi table, discard...
func PostGoldKPIFromNF(w http.ResponseWriter, r *http.Request) {
log.Debug("PostKPIReportFromNF processing... ")
vars := mux.Vars(r)
apiVer := vars["apiVersion"]
if apiVer != global.ApiVersionV1 {
log.Error("Uri api version is invalid. apiVersion:", apiVer)
services.ResponseNotFound404UriNotExist(w, r)
return
}
// body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
if err != nil {
log.Error("Faile to io.ReadAll: ", err)
services.ResponseNotFound404UriNotExist(w, r)
return
}
log.Trace("Request body:", string(body))
kpiReport := new(KpiReport)
_ = json.Unmarshal(body, &kpiReport)
log.Trace("kpiReport:", kpiReport)
session := xEngine.NewSession()
defer session.Close()
goldKpi := new(GoldKpi)
layout := time.RFC3339Nano
goldKpi.Date = GetDateFromTimeString(layout, kpiReport.Task.Period.StartTime)
goldKpi.Index, _ = strconv.Atoi(vars["index"])
goldKpi.StartTime = global.GetFmtTimeString(layout, kpiReport.Task.Period.StartTime, time.DateTime)
goldKpi.EndTime = global.GetFmtTimeString(layout, kpiReport.Task.Period.EndTime, time.DateTime)
// get time granularity from startTime and endTime
seconds, _ := global.GetSecondDuration(goldKpi.StartTime, goldKpi.EndTime)
goldKpi.Granularity = 60
if seconds != 0 && seconds <= math.MaxInt8 && seconds >= math.MinInt8 {
goldKpi.Granularity = int8(seconds)
}
goldKpi.NEName = kpiReport.Task.NE.NEName
goldKpi.RmUid = kpiReport.Task.NE.RmUID
goldKpi.NEType = kpiReport.Task.NE.NeType
goldKpi.Timestamp = global.GetFmtTimeString(layout, kpiReport.Timestamp, time.DateTime)
// 黄金指标事件对象
kpiEvent := map[string]any{
// kip_id ...
"neType": goldKpi.NEType,
"neName": goldKpi.NEName,
"rmUID": goldKpi.RmUid,
"startIndex": goldKpi.Index,
"timeGroup": goldKpi.StartTime,
}
// insert into new kpi_report_xxx table
kpiData := new(KpiData)
kpiData.Date = goldKpi.Date
kpiData.Index = goldKpi.Index
//st, _ := time.ParseInLocation(time.RFC3339Nano, kpiReport.Task.Period.StartTime, time.Local)
//et, _ := time.ParseInLocation(time.RFC3339Nano, kpiReport.Task.Period.EndTime, time.Local)
kpiData.StartTime = goldKpi.StartTime
kpiData.EndTime = goldKpi.EndTime
kpiData.Granularity = goldKpi.Granularity
kpiData.NEName = goldKpi.NEName
kpiData.NEType = goldKpi.NEType
kpiData.RmUid = goldKpi.RmUid
kpiVal := new(KPIVal)
kpiData.CreatedAt = time.Now().UnixMilli()
for _, k := range kpiReport.Task.NE.KPIs {
kpiEvent[k.KPIID] = k.Value // kip_id
goldKpi.KpiId = k.KPIID
goldKpi.Value = k.Value
goldKpi.Error = k.Err
kpiVal.KPIID = k.KPIID
kpiVal.Value = int64(k.Value)
kpiVal.Err = k.Err
kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal)
//log.Trace("goldKpi:", goldKpi)
// 启动事务
err := session.Begin()
if err != nil {
log.Error("Failed to Begin gold_kpi:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
gkpi := &GoldKpi{}
_, err = session.Where("id = ?", 1).ForUpdate().Get(gkpi)
if err != nil {
// 回滚事务
session.Rollback()
log.Error("Failed to ForUpdate gold_kpi:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
affected, err := session.Insert(goldKpi)
if err != nil && affected <= 0 {
session.Rollback()
log.Error("Failed to insert gold_kpi:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
// 提交事务
err = session.Commit()
if err != nil {
log.Error("Failed to Commit gold_kpi:", err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
}
// insert kpi_report table, no session
tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
affected, err := xEngine.Table(tableName).Insert(kpiData)
if err != nil && affected <= 0 {
log.Errorf("Failed to insert %s:%v", tableName, err)
services.ResponseInternalServerError500ProcessError(w, err)
return
}
// 推送到ws订阅组
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI, kpiEvent)
if goldKpi.NEType == "UPF" {
wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF, kpiEvent)
}
services.ResponseStatusOK204NoContent(w)
}
type MeasureTask struct {
Tasks []Task `json:"Tasks"`
NotifyUrl string `json:"NotifyUrl"` /* "http://xEngine.xEngine.xEngine.x:xxxx/api/rest/performanceManagement/v1/elementType/smf/objectType/measureReport */

7
features/pm/service.go
View File

@@ -1,10 +1,9 @@
package pm
import (
"nms_cxy/features/pm/kpi_c_report"
"nms_cxy/features/pm/kpi_c_title"
"nms_cxy/lib/log"
"be.ems/features/pm/kpi_c_report"
"be.ems/features/pm/kpi_c_title"
"be.ems/lib/log"
"github.com/gin-gonic/gin"
)

12
features/security/account.go
View File

@@ -6,12 +6,12 @@ import (
"net/http"
"strings"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/oauth"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/dborm"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/oauth"
"be.ems/lib/services"
"be.ems/restagent/config"
)
var (

7
features/sm/backup.go
View File

@@ -8,10 +8,9 @@ import (
"os/exec"
"time"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/log"
"be.ems/lib/services"
"be.ems/restagent/config"
_ "github.com/go-sql-driver/mysql"
)

12
features/state/getstate.go
View File

@@ -14,12 +14,12 @@ import (
"github.com/go-resty/resty/v2"
"github.com/gorilla/mux"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
tokenConst "nms_cxy/src/framework/constants/token"
"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"
)
type CpuUsage struct {

3
features/state/state_linux.go
View File

@@ -11,8 +11,7 @@ import (
"syscall"
"time"
"nms_cxy/lib/log"
"be.ems/lib/log"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/disk"
"github.com/shirou/gopsutil/v4/mem"

3
features/state/sysinfo.go
View File

@@ -1,8 +1,7 @@
package state
import (
"nms_cxy/lib/log"
"be.ems/lib/log"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/mem"
)

12
features/trace/trace.go
View File

@@ -12,12 +12,12 @@ import (
"github.com/go-resty/resty/v2"
"github.com/gorilla/mux"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/run"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
"be.ems/lib/dborm"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/run"
"be.ems/lib/services"
"be.ems/restagent/config"
)
var (

19
features/ue/ue.go
View File

@@ -8,15 +8,14 @@ import (
"strings"
"time"
"nms_cxy/lib/core/ctx"
"nms_cxy/lib/dborm"
"nms_cxy/lib/global"
"nms_cxy/lib/log"
"nms_cxy/lib/services"
"nms_cxy/omc/config"
tokenConst "nms_cxy/src/framework/constants/token"
neService "nms_cxy/src/modules/network_element/service"
"be.ems/lib/core/ctx"
"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"
)
@@ -254,7 +253,7 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
return
}
neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
var response services.MapResponse
if neInfo.NeId == neId && neInfo.NeId != "" {