diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml index 8265a428..81bd699d 100644 --- a/config/etc/default/restconf.yaml +++ b/config/etc/default/restconf.yaml @@ -127,7 +127,7 @@ omc: # Alarm module setting # Forward interface: -# email/sms +# email/sms/smsc alarm: forwardAlarm: true email: @@ -143,6 +143,11 @@ alarm: accessKeySecret: xxx signName: XXX SMSC templateCode: 1000 + smsc: + addr: "192.168.13.114:2775" + systemID: "alarmsmsfw" + password: "omc123" + systemType: "" # User authorized information # crypt: mysql/md5/bcrypt diff --git a/features/fm/alarm.go b/features/fm/alarm.go index dc39c2ed..98e0bb43 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -461,8 +461,8 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { if err = AlarmEmailForward(&alarmData); err != nil { log.Error("Failed to AlarmEmailForward:", err) } - if err = AlarmForwardBySMSC(&alarmData); err != nil { - log.Error("Failed to AlarmForwardBySMSC:", err) + if err = AlarmForwardBySMPP(&alarmData); err != nil { + log.Error("Failed to AlarmForwardBySMPP:", err) } } } @@ -735,8 +735,8 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) { if err = AlarmEmailForward(&alarmData); err != nil { log.Error("Failed to AlarmEmailForward:", err) } - if err = AlarmForwardBySMSC(&alarmData); err != nil { - log.Error("Failed to AlarmForwardBySMSC:", err) + if err = AlarmForwardBySMPP(&alarmData); err != nil { + log.Error("Failed to AlarmForwardBySMPP:", err) } } } diff --git a/features/fm/smsforward.go b/features/fm/smsforward.go index 635a05cf..fa2fa291 100644 --- a/features/fm/smsforward.go +++ b/features/fm/smsforward.go @@ -111,9 +111,9 @@ func AlarmForwardBySMPP(alarmData *Alarm) error { auth := gosmpp.Auth{ SMSC: config.GetYamlConfig().Alarm.SMSC.Addr, - SystemID: config.GetYamlConfig().Alarm.SMSC.UserName, + SystemID: config.GetYamlConfig().Alarm.SMSC.SystemID, Password: config.GetYamlConfig().Alarm.SMSC.Password, - SystemType: "", + SystemType: config.GetYamlConfig().Alarm.SMSC.SystemType, } // conn, err := gosmpp.NonTLSDialer(auth.SMSC) @@ -141,7 +141,7 @@ func AlarmForwardBySMPP(alarmData *Alarm) error { }, }, -1) if err != nil { - log.Error(err) + log.Error("Failed to create SMPP new session:", err) return err } defer func() { diff --git a/features/fm/ucpcli.go b/features/fm/ucpcli.go index 94581d5c..4c7b0e02 100644 --- a/features/fm/ucpcli.go +++ b/features/fm/ucpcli.go @@ -13,9 +13,9 @@ import ( func AlarmForwardBySMSC(alarmData *Alarm) error { opt := &ucp.Options{ Addr: config.GetYamlConfig().Alarm.SMSC.Addr, - User: config.GetYamlConfig().Alarm.SMSC.UserName, + User: config.GetYamlConfig().Alarm.SMSC.SystemID, Password: config.GetYamlConfig().Alarm.SMSC.Password, - AccessCode: "", + AccessCode: config.GetYamlConfig().Alarm.SMSC.SystemType, } client := ucp.New(opt) diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 05f3864b..45c12473 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -144,9 +144,10 @@ alarm: signName: xxx SMSC templateCode: 1000 smsc: - addr: "192.168.14.211:2775" - userName: OMC - password: "123456" + addr: "192.168.13.114:2775" + systemID: "omc" + password: "omc123" + systemType: "UTRAN" #User authorized information # crypt: mysql/md5/bcrypt