ref: 多core表结构和代码调整修改

features/cm/ne.go

@@ -15,9 +15,7 @@ import (
 	"be.ems/lib/global"
 	"be.ems/lib/log"
 	"be.ems/lib/services"
-	"be.ems/src/framework/constants"
 	"be.ems/src/framework/database/db"
-	neService "be.ems/src/modules/network_element/service"
 
 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"
@@ -26,8 +24,6 @@ import (
 var (
 	// NE CM export/import
 	NeCmUri = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm"
-	// NE info
-	UriNeInfo = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/neInfo"
 	// NE backup file
 	UriNeCmFile = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/{neType}/neBackup/{fileName}"
 	// service action uri, action: start/stop/restart
@@ -36,7 +32,6 @@ var (
 	UriNeInstance = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/instance/{action}"
 
 	CustomNeCmUri     = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm"
-	CustomUriNeInfo   = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/neInfo"
 	CustomUriNeCmFile = config.UriPrefix + "/systemManagement/{apiVersion}/{neType}/neBackup/{fileName}"
 	// service action uri, action: start/stop/restart
 	CustomUriNeService = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/service/{action}"
@@ -68,37 +63,6 @@ func init() {
 		SetTimeout(time.Duration(1 * time.Second))
 }
 
-func GetNeInfo(w http.ResponseWriter, r *http.Request) {
-	log.Debug("GetNeInfo processing... ")
-
-	// _, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("Request error:", err)
-	// 	return
-	// }
-
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	neId := services.GetUriParamString(r, "ne_id", ",", false, false)
-
-	//	no, _ := strconv.ParseInt(neId, 10, 64)
-	neInfo, err := dborm.XormGetNeInfo(neType, neId)
-	if err != nil {
-		log.Error("dborm.XormGetNeInfo is failed:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-
-	var response services.DataResponse
-	response.Data = neInfo
-	services.ResponseWithJson(w, http.StatusOK, response)
-}
-
 type OmcNeConfig struct {
 	NeId       string `json:"neId" xorm:"ne_id"`             // 网元标识(内部),
 	RmUID      string `json:"rmUID" xorm:"rm_uid"`           // rmUID 网元唯一标识
@@ -110,291 +74,6 @@ type OmcNeConfig struct {
 	Dn string `json:"dn" xorm:"dn"` // 资源里边的ManagedBy，性能的Dn，网络唯一标识
 }
 
-func PostNeInfo(w http.ResponseWriter, r *http.Request) {
-	log.Debug("PostNeInfo processing... ")
-
-	// _, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("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)
-	syncFlag := services.GetUriParamString(r, "sync2ne", ",", false, false)
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	if err != nil {
-		log.Error("Failed to o.ReadAll:", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	log.Trace("Body:", string(body))
-
-	neInfo := new(dborm.NeInfo)
-	err = json.Unmarshal(body, neInfo)
-	if err != nil {
-		log.Error("Failed to json.Unmarshal:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-	//neInfo.UpdateTime = time.Now().Format(time.DateTime)
-	neInfo.UpdateTime = time.Now()
-	log.Debug("NE info:", neInfo)
-
-	//if !config.GetYamlConfig().OMC.Chk2Ne {
-	if syncFlag == "false" || neTypeUpper == config.GetYamlConfig().OMC.NeType {
-		neInfo.Status = NEStatusMaintain
-		affected, err := dborm.XormInsertNeInfo(neInfo)
-		if err != nil {
-			log.Error("Failed to insert Ne info:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-
-		// 刷新缓存，不存在结构体网元Id空字符串
-		neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
-
-		mapRow := make(map[string]interface{})
-		row := map[string]interface{}{"affectedRows": affected}
-		mapRow["data"] = row
-		services.ResponseWithJson(w, http.StatusOK, mapRow)
-		return
-	} else {
-		hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port)
-		//hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
-		apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig?ne_id=%s", config.DefaultUriPrefix, strings.ToLower(neInfo.NeType), neInfo.NeId)
-		requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri)
-		log.Debug("requestURI2NF:", requestURI2NF)
-
-		omcNeConfig := &OmcNeConfig{
-			NeId:       neInfo.NeId,
-			RmUID:      neInfo.RmUID,
-			NeName:     neInfo.NeName,
-			PvFlag:     neInfo.PvFlag,
-			Province:   neInfo.Province,
-			VendorName: neInfo.VendorName,
-			Dn:         neInfo.Dn,
-		}
-		body, _ = json.Marshal(omcNeConfig)
-		response, err := client.R().
-			EnableTrace().
-			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-			SetBody(body).
-			Put(requestURI2NF)
-		if err != nil {
-			log.Error("Failed to Put:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		log.Info("StatusCode: ", response.StatusCode())
-
-		respMsg := make(map[string]interface{})
-		switch response.StatusCode() {
-		case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
-			neInfo.Status = NEStatusActive
-			affected, err := dborm.XormInsertNeInfo(neInfo)
-			if err != nil {
-				log.Error("Failed to dborm.XormInsertNeInfo:", err)
-				services.ResponseInternalServerError500ProcessError(w, err)
-				return
-			} else if affected <= 0 {
-				log.Infof("Not record affected to insert ne_info")
-			}
-
-			// 刷新缓存，不存在结构体网元Id空字符串
-			neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
-
-			services.ResponseStatusOK204NoContent(w)
-			return
-		default:
-			log.Info("response body:", string(response.Body()))
-			body := new(map[string]interface{})
-			_ = json.Unmarshal(response.Body(), &body)
-			respMsg["error"] = body
-		}
-
-		services.ResponseWithJson(w, response.StatusCode(), respMsg)
-		return
-	}
-}
-
-func PutNeInfo(w http.ResponseWriter, r *http.Request) {
-	log.Debug("PutNeInfo processing... ")
-
-	// _, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("Request error:", err)
-	// 	return
-	// }
-
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	neTypeLower := strings.ToLower(neType)
-	neTypeUpper := strings.ToUpper(neType)
-	syncFlag := services.GetUriParamString(r, "sync2ne", ",", false, false)
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	if err != nil {
-		log.Error("Failed to io.ReadAll:", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	neInfo := new(dborm.NeInfo)
-	_ = json.Unmarshal(body, neInfo)
-	neInfo.NeType = strings.ToUpper(neType)
-	neInfo.UpdateTime = time.Now()
-	log.Debug("NE info:", neInfo)
-
-	//if !config.GetYamlConfig().OMC.Chk2Ne {
-	if syncFlag == "false" || neTypeUpper == config.GetYamlConfig().OMC.NeType {
-		neInfo.Status = NEStatusMaintain
-		affected, err := dborm.XormUpdateNeInfo(neInfo)
-		if err != nil {
-			log.Error("Failed to update Ne info:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-
-		// 刷新缓存，不存在结构体网元Id空字符串
-		neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
-
-		mapRow := make(map[string]interface{})
-		row := map[string]interface{}{"affectedRows": affected}
-		mapRow["data"] = row
-		services.ResponseWithJson(w, http.StatusOK, mapRow)
-		return
-	} else {
-		hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port)
-		//hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
-		apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig?ne_id=%s", config.DefaultUriPrefix, neTypeLower, neInfo.NeId)
-		requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri)
-		log.Debug("requestURI2NF:", requestURI2NF)
-
-		omcNeConfig := &OmcNeConfig{
-			NeId:       neInfo.NeId,
-			RmUID:      neInfo.RmUID,
-			NeName:     neInfo.NeName,
-			PvFlag:     neInfo.PvFlag,
-			Province:   neInfo.Province,
-			VendorName: neInfo.VendorName,
-			Dn:         neInfo.Dn,
-		}
-		body, _ = json.Marshal(omcNeConfig)
-		response, err := client.R().
-			EnableTrace().
-			SetHeaders(map[string]string{constants.HEADER_KEY: r.Header.Get(constants.HEADER_KEY)}).
-			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-			SetBody(body).
-			Put(requestURI2NF)
-		if err != nil {
-			log.Error("Failed to Put:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		log.Info("StatusCode: ", response.StatusCode())
-
-		respMsg := make(map[string]interface{})
-		switch response.StatusCode() {
-		case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
-			neInfo.Status = NEStatusActive
-			affected, err := dborm.XormUpdateNeInfo(neInfo)
-			if err != nil {
-				log.Error("Failed to dborm.XormUpdateNeInfo:", err)
-				services.ResponseInternalServerError500ProcessError(w, err)
-				return
-			} else if affected <= 0 {
-				log.Infof("Not record affected to insert ne_info")
-			}
-
-			// 刷新缓存，不存在结构体网元Id空字符串
-			neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
-
-			services.ResponseStatusOK204NoContent(w)
-			return
-		default:
-			log.Info("response body:", string(response.Body()))
-			body := new(map[string]interface{})
-			_ = json.Unmarshal(response.Body(), &body)
-			respMsg["error"] = body
-		}
-
-		services.ResponseWithJson(w, response.StatusCode(), respMsg)
-		return
-	}
-}
-
-func DeleteNeInfo(w http.ResponseWriter, r *http.Request) {
-	log.Debug("DeleteNeInfo processing... ")
-
-	// _, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("Request error:", err)
-	// 	return
-	// }
-
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	if err != nil {
-		log.Error("io.ReadAll is failed:", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	neInfo := new(dborm.NeInfo)
-	_ = json.Unmarshal(body, neInfo)
-	neInfo.NeType = strings.ToUpper(neType)
-	neInfo.NeId = services.GetUriParamString(r, "ne_id", ",", false, false)
-	neInfo, err = dborm.XormGetNeInfo(neInfo.NeType, neInfo.NeId)
-	if err != nil || neInfo == nil {
-		log.Error("Failed to delete Ne info:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-	log.Debug("NE info:", neInfo)
-
-	// if NE in active status, can't delete NE
-	if !IsActiveNF(neInfo) {
-		affected, err := dborm.XormDeleteNeInfo(neInfo)
-		if err != nil {
-			log.Error("Failed to delete Ne info:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-
-		// 刷新缓存，不存在结构体网元Id空字符串
-		neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
-
-		mapRow := make(map[string]interface{})
-		row := map[string]interface{}{"affectedRows": affected}
-		mapRow["data"] = row
-		services.ResponseWithJson(w, http.StatusOK, mapRow)
-		return
-	}
-	err = global.ErrCMCannotDeleteActiveNE
-	log.Error(err)
-	services.ResponseInternalServerError500ProcessError(w, err)
-}
-
 func IsActiveNF(neInfo *dborm.NeInfo) bool {
 	log.Debug("IsActiveNF processing... ")
 

features/cm/param.go

@@ -1,208 +0,0 @@
-package cm
-
-import (
-	"strings"
-
-	"be.ems/lib/config"
-	"be.ems/lib/core/ctx"
-	"be.ems/lib/global"
-	"be.ems/lib/log"
-	"be.ems/lib/services"
-
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-
-	neService "be.ems/src/modules/network_element/service"
-
-	"github.com/go-resty/resty/v2"
-	"github.com/gorilla/mux"
-)
-
-var (
-	// parameter config management
-	ParamConfigUri = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/config/{paraName}"
-
-	CustomParamConfigUri = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/config/{paraName}"
-)
-
-func GetParamConfigFromNF(w http.ResponseWriter, r *http.Request) {
-	log.Debug("GetParamConfigFromNF processing... ")
-
-	neId := ctx.GetQuery(r, "ne_id")
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" || neId == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId)
-
-	var response services.DataResponse
-	if neInfo.NeId == neId && neInfo.NeId != "" {
-		requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
-		log.Debug("requestURI2NF:", requestURI2NF)
-
-		resp, err := client.R().
-			EnableTrace().
-			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 from NF:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		} else {
-			_ = json.Unmarshal(resp.Body(), &response)
-		}
-		log.Debug("response:", response)
-	}
-
-	services.ResponseWithJson(w, http.StatusOK, response)
-}
-
-func PostParamConfigToNF(w http.ResponseWriter, r *http.Request) {
-	log.Debug("PostParamConfigToNF processing... ")
-
-	neId := ctx.GetQuery(r, "ne_id")
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" || neId == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId)
-
-	if neInfo.NeId != neId || neInfo.NeId == "" {
-		log.Error("neId is empty")
-		services.ResponseInternalServerError500DatabaseOperationFailed(w)
-		return
-	}
-
-	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
-	log.Debug("requestURI2NF: POST ", requestURI2NF)
-
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) //io.LimitReader限制大小
-	if err != nil {
-		log.Error("io.ReadAll is failed:", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	client := resty.New()
-	response, err := client.R().
-		EnableTrace().
-		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-		SetBody(body).
-		Post(requestURI2NF)
-	if err != nil {
-		log.Error("Failed to POST to NF:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-
-	services.ResponseWithJson(w, http.StatusNoContent, response)
-}
-
-func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) {
-	log.Debug("PutParamConfigToNF processing... ")
-
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	// OMC配置接口 /api/rest/systemManagement/v1/elementType/omc/objectType/config/omcNeConfig
-	if v, ok := vars["paraName"]; ok && v == "omcNeConfig" && strings.ToLower(neType) == "omc" {
-		PutOMCNeConfig(w, r)
-		return
-	}
-
-	neId := ctx.GetQuery(r, "ne_id")
-	neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId)
-
-	if neInfo.NeId != neId || neInfo.NeId == "" {
-		log.Error("neId is empty")
-		services.ResponseInternalServerError500DatabaseOperationFailed(w)
-		return
-	}
-
-	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
-	log.Debug("requestURI2NF: PUT ", requestURI2NF)
-
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) //io.LimitReader限制大小
-	if err != nil {
-		log.Error("io.ReadAll is failed:", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	client := resty.New()
-	response, err := client.R().
-		EnableTrace().
-		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-		SetBody(body).
-		Put(requestURI2NF)
-	if err != nil {
-		log.Error("Failed to Put to NF:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-
-	services.ResponseWithJson(w, http.StatusNoContent, response)
-}
-
-// PutOMCNeConfig 网元OMC配置
-//
-// 目前没配置，返回204
-func PutOMCNeConfig(w http.ResponseWriter, r *http.Request) {
-	services.ResponseStatusOK204NoContent(w)
-}
-
-func DeleteParamConfigToNF(w http.ResponseWriter, r *http.Request) {
-	log.Debug("DeleteParamConfigToNF processing... ")
-
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	neId := ctx.GetQuery(r, "ne_id")
-	neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId)
-
-	if neInfo.NeId != neId || neInfo.NeId == "" {
-		log.Error("neId is empty")
-		services.ResponseInternalServerError500DatabaseOperationFailed(w)
-		return
-	}
-
-	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
-	log.Debug("requestURI2NF: DELETE ", requestURI2NF)
-
-	client := resty.New()
-	response, err := client.R().
-		EnableTrace().
-		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-		Delete(requestURI2NF)
-	if err != nil {
-		log.Error("Failed to delete parameter:", err)
-		services.ResponseInternalServerError500NFConnectRefused(w)
-		return
-	}
-
-	services.ResponseWithJson(w, http.StatusNoContent, response)
-}