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

add: support alarm forward by sms

Browse Source
This commit is contained in:
simonzhangsz
2024-04-19 18:30:38 +08:00
parent e05c2a6a51
commit f7aa7a5c30
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/etc/default/restconf.yaml
View File

@@ -127,7 +127,7 @@ omc:
# Alarm module setting # Alarm module setting
# Forward interface: # Forward interface:
# email/sms # email/sms/smsc
alarm: alarm:
forwardAlarm: true forwardAlarm: true
email: email:
@@ -143,6 +143,11 @@ alarm:
accessKeySecret: xxx accessKeySecret: xxx
signName: XXX SMSC signName: XXX SMSC
templateCode: 1000 templateCode: 1000
smsc:
addr: "192.168.13.114:2775"
systemID: "alarmsmsfw"
password: "omc123"
systemType: ""
# User authorized information # User authorized information
# crypt: mysql/md5/bcrypt # crypt: mysql/md5/bcrypt

8
features/fm/alarm.go
View File

@@ -461,8 +461,8 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
if err = AlarmEmailForward(&alarmData); err != nil { if err = AlarmEmailForward(&alarmData); err != nil {
log.Error("Failed to AlarmEmailForward:", err) log.Error("Failed to AlarmEmailForward:", err)
} }
if err = AlarmForwardBySMSC(&alarmData); err != nil { if err = AlarmForwardBySMPP(&alarmData); err != nil {
log.Error("Failed to AlarmForwardBySMSC:", err) log.Error("Failed to AlarmForwardBySMPP:", err)
} }
} }
} }
@@ -735,8 +735,8 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
if err = AlarmEmailForward(&alarmData); err != nil { if err = AlarmEmailForward(&alarmData); err != nil {
log.Error("Failed to AlarmEmailForward:", err) log.Error("Failed to AlarmEmailForward:", err)
} }
if err = AlarmForwardBySMSC(&alarmData); err != nil { if err = AlarmForwardBySMPP(&alarmData); err != nil {
log.Error("Failed to AlarmForwardBySMSC:", err) log.Error("Failed to AlarmForwardBySMPP:", err)
} }
} }
} }

6
features/fm/smsforward.go
View File

@@ -111,9 +111,9 @@ func AlarmForwardBySMPP(alarmData *Alarm) error {
auth := gosmpp.Auth{ auth := gosmpp.Auth{
SMSC: config.GetYamlConfig().Alarm.SMSC.Addr, SMSC: config.GetYamlConfig().Alarm.SMSC.Addr,
SystemID: config.GetYamlConfig().Alarm.SMSC.UserName, SystemID: config.GetYamlConfig().Alarm.SMSC.SystemID,
Password: config.GetYamlConfig().Alarm.SMSC.Password, Password: config.GetYamlConfig().Alarm.SMSC.Password,
SystemType: "", SystemType: config.GetYamlConfig().Alarm.SMSC.SystemType,
} }
// conn, err := gosmpp.NonTLSDialer(auth.SMSC) // conn, err := gosmpp.NonTLSDialer(auth.SMSC)
@@ -141,7 +141,7 @@ func AlarmForwardBySMPP(alarmData *Alarm) error {
}, },
}, -1) }, -1)
if err != nil { if err != nil {
log.Error(err) log.Error("Failed to create SMPP new session:", err)
return err return err
} }
defer func() { defer func() {

4
features/fm/ucpcli.go
View File

@@ -13,9 +13,9 @@ import (
func AlarmForwardBySMSC(alarmData *Alarm) error { func AlarmForwardBySMSC(alarmData *Alarm) error {
opt := &ucp.Options{ opt := &ucp.Options{
Addr: config.GetYamlConfig().Alarm.SMSC.Addr, Addr: config.GetYamlConfig().Alarm.SMSC.Addr,
User: config.GetYamlConfig().Alarm.SMSC.UserName, User: config.GetYamlConfig().Alarm.SMSC.SystemID,
Password: config.GetYamlConfig().Alarm.SMSC.Password, Password: config.GetYamlConfig().Alarm.SMSC.Password,
AccessCode: "", AccessCode: config.GetYamlConfig().Alarm.SMSC.SystemType,
} }
client := ucp.New(opt) client := ucp.New(opt)

7
restagent/etc/restconf.yaml
View File

@@ -144,9 +144,10 @@ alarm:
signName: xxx SMSC signName: xxx SMSC
templateCode: 1000 templateCode: 1000
smsc: smsc:
addr: "192.168.14.211:2775" addr: "192.168.13.114:2775"
userName: OMC systemID: "omc"
password: "123456" password: "omc123"
systemType: "UTRAN"
#User authorized information #User authorized information
# crypt: mysql/md5/bcrypt # crypt: mysql/md5/bcrypt