OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: ne info status in 0,3

Browse Source
This commit is contained in:
simonzhangsz
2024-01-03 10:10:25 +08:00
parent 06e29df8fa
commit 8239977c58
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crontask/db.go
View File

@@ -117,7 +117,7 @@ func XormGetAllNeInfo(nes *[]NeInfo) (*[]NeInfo, error) {
log.Debug("XormGetAllNeInfo processing... ") log.Debug("XormGetAllNeInfo processing... ")
ne := new(NeInfo) ne := new(NeInfo)
rows, err := dbClient.xEngine.Table("ne_info").Where("status='0'").Rows(ne) rows, err := dbClient.xEngine.Table("ne_info").Where("status in ('0','3')").Rows(ne)
if err != nil { if err != nil {
log.Error("Failed to get table ne_info from database:", err) log.Error("Failed to get table ne_info from database:", err)
return nil, err return nil, err

4
features/cm/param.go
View File

@@ -48,9 +48,9 @@ func GetParamConfigFromNF(w http.ResponseWriter, r *http.Request) {
getNeInfoURI := restHostPort + getNeInfoPattern getNeInfoURI := restHostPort + getNeInfoPattern
neId := services.GetUriParamString(r, "ne_id", ",", true, true) neId := services.GetUriParamString(r, "ne_id", ",", true, true)
if neId == "" { if neId == "" {
getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status='0'+and+ne_type='%s'", neType) getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status in ('0','3')+and+ne_type='%s'", neType)
} else { } else {
getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status='0'+and+ne_type='%v'+and+ne_id+in+%v", neType, neId) getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status in ('0','3')+and+ne_type='%v'+and+ne_id+in+%v", neType, neId)
} }
log.Debug("getNeInfoURI:", getNeInfoURI) log.Debug("getNeInfoURI:", getNeInfoURI)

8
features/state/getstate.go
View File

@@ -750,7 +750,7 @@ func GetStateFromNF(w http.ResponseWriter, r *http.Request) {
restHostPort := fmt.Sprintf("http://127.0.0.1:%d", config.GetYamlConfig().Rest[0].Port) restHostPort := fmt.Sprintf("http://127.0.0.1:%d", config.GetYamlConfig().Rest[0].Port)
getNeInfoPattern := fmt.Sprintf(config.DefaultUriPrefix+"/databaseManagement/v1/elementType/%s/objectType/ne_info", getNeInfoPattern := fmt.Sprintf(config.DefaultUriPrefix+"/databaseManagement/v1/elementType/%s/objectType/ne_info",
config.GetYamlConfig().Database.Name) config.GetYamlConfig().Database.Name)
getNeInfoURI := restHostPort + getNeInfoPattern + "?WHERE=status='0'" getNeInfoURI := restHostPort + getNeInfoPattern + "?WHERE=status in ('0','3')"
log.Debug("getNeInfoPattern:", getNeInfoPattern) log.Debug("getNeInfoPattern:", getNeInfoPattern)
resp, err := client.R(). resp, err := client.R().
@@ -774,9 +774,9 @@ func GetStateFromNF(w http.ResponseWriter, r *http.Request) {
getNeInfoURI := restHostPort + getNeInfoPattern getNeInfoURI := restHostPort + getNeInfoPattern
neId := services.GetUriParamString(r, "ne_id", ",", true, true) neId := services.GetUriParamString(r, "ne_id", ",", true, true)
if neId == "" { if neId == "" {
getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status='0'+and+ne_type='%s'", neType) getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status in ('0','3')+and+ne_type='%s'", neType)
} else { } else {
getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status='0'+and+ne_type='%v'+and+ne_id+in+%v", neType, neId) getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status in ('0','3')+and+ne_type='%v'+and+ne_id+in+%v", neType, neId)
} }
log.Debug("getNeInfoURI:", getNeInfoURI) log.Debug("getNeInfoURI:", getNeInfoURI)
@@ -886,7 +886,7 @@ func GetEMSState(ip string) *SysState {
OsInfo: getUnameStr(), OsInfo: getUnameStr(),
DbInfo: "mysql Ver 15.1 Distrib 10.3.35-MariaDB, for Linux (aarch64) using readline 5.1", DbInfo: "mysql Ver 15.1 Distrib 10.3.35-MariaDB, for Linux (aarch64) using readline 5.1",
IpAddr: []string{ip}, IpAddr: []string{ip},
Port: 3030, Port: config.GetYamlConfig().Rest[0].Port,
Version: version, Version: version,
Capability: 9999999, Capability: 9999999,
SerialNum: config.GetYamlConfig().OMC.Sn, SerialNum: config.GetYamlConfig().OMC.Sn,

2
lib/dborm/dborm.go
View File

@@ -222,7 +222,7 @@ func XormGetNeInfoByRmUID(neType string, rmUID string) (*NeInfo, error) {
log.Error("Failed to get table ne_info from database:", err) log.Error("Failed to get table ne_info from database:", err)
return nil, err return nil, err
} else if !has { } else if !has {
log.Infof("Not found ne_info from database, status='0', neType=%s, neId=%s", neType, rmUID) log.Infof("Not found ne_info from database, status in ('0','3'), neType=%s, neId=%s", neType, rmUID)
return nil, nil return nil, nil
} }