Merge remote-tracking branch 'origin/main' into multi-tenant

features/cdr/cdrevent.go

@@ -95,6 +95,8 @@ func PostCDREventFrom(w http.ResponseWriter, r *http.Request) {
 			wsService.NewWSSend.ByGroupID(wsService.GROUP_SMF_CDR+neInfo.NeId, cdrEvent)
 		case "SMSC":
 			wsService.NewWSSend.ByGroupID(wsService.GROUP_SMSC_CDR+neInfo.NeId, cdrEvent)
+		case "SGWC":
+			wsService.NewWSSend.ByGroupID(wsService.GROUP_SGWC_CDR+neInfo.NeId, cdrEvent)
 		}
 	}
 

features/state/getstate.go

@@ -1029,10 +1029,6 @@ func GetEMSState(ip string) *SysState {
 		}
 	}
 
-	version := "16.1.1"
-	if global.Version != "" {
-		version = global.Version
-	}
 	hostName, _ := os.Hostname()
 	dbInfo, _ := dborm.XormGetMySQLVersion()
 	emsState := &SysState{
@@ -1041,10 +1037,10 @@ func GetEMSState(ip string) *SysState {
 		DbInfo:       dbInfo,
 		IpAddr:       ipAddrs,
 		Port:         config.GetYamlConfig().Rest[0].Port,
-		Version:      version,
-		Capability:   9999999,
+		Version:      global.Version,
+		Capability:   config.GetYamlConfig().OMC.Capability,
 		SerialNum:    config.GetYamlConfig().OMC.Sn,
-		ExpiryDate:   "-",
+		ExpiryDate:   config.GetYamlConfig().OMC.ExpiryDate,
 		HardwareInfo: HardwareInfo{CPUs: getCpuNumber(), Memory: getTotalMemory()},
 		CpuUsage:     *cpuUsage,
 		MemUsage:     *memUsage,