fix: OMC网元状态默认参数不为空
This commit is contained in:
@@ -1029,6 +1029,19 @@ func GetEMSState(ip string) *SysState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CapabilityInt := config.GetYamlConfig().OMC.Capability
|
||||||
|
if CapabilityInt == 0 {
|
||||||
|
CapabilityInt = 5000
|
||||||
|
}
|
||||||
|
snStr := config.GetYamlConfig().OMC.Sn
|
||||||
|
if snStr == "" {
|
||||||
|
snStr = "-"
|
||||||
|
}
|
||||||
|
expiryDateStr := config.GetYamlConfig().OMC.ExpiryDate
|
||||||
|
if expiryDateStr == "" {
|
||||||
|
expiryDateStr = "-"
|
||||||
|
}
|
||||||
|
|
||||||
hostName, _ := os.Hostname()
|
hostName, _ := os.Hostname()
|
||||||
dbInfo, _ := dborm.XormGetMySQLVersion()
|
dbInfo, _ := dborm.XormGetMySQLVersion()
|
||||||
emsState := &SysState{
|
emsState := &SysState{
|
||||||
@@ -1038,9 +1051,9 @@ func GetEMSState(ip string) *SysState {
|
|||||||
IpAddr: ipAddrs,
|
IpAddr: ipAddrs,
|
||||||
Port: config.GetYamlConfig().Rest[0].Port,
|
Port: config.GetYamlConfig().Rest[0].Port,
|
||||||
Version: global.Version,
|
Version: global.Version,
|
||||||
Capability: config.GetYamlConfig().OMC.Capability,
|
Capability: CapabilityInt,
|
||||||
SerialNum: config.GetYamlConfig().OMC.Sn,
|
SerialNum: snStr,
|
||||||
ExpiryDate: config.GetYamlConfig().OMC.ExpiryDate,
|
ExpiryDate: expiryDateStr,
|
||||||
HardwareInfo: HardwareInfo{CPUs: getCpuNumber(), Memory: getTotalMemory()},
|
HardwareInfo: HardwareInfo{CPUs: getCpuNumber(), Memory: getTotalMemory()},
|
||||||
CpuUsage: *cpuUsage,
|
CpuUsage: *cpuUsage,
|
||||||
MemUsage: *memUsage,
|
MemUsage: *memUsage,
|
||||||
|
|||||||
Reference in New Issue
Block a user