alarm-go rmr init cleaned

[ric-plt/alarm-go.git] / alarm / alarm.go

diff --git a/alarm/alarm.go b/alarm/alarm.go
index 4059b0d..1cb26b4 100755 (executable)
--- a/alarm/alarm.go
+++ b/alarm/alarm.go
@@ -46,19 +46,33 @@ import "C"
 // The identities are used when raising/clearing alarms, unless provided by the applications.
 func InitAlarm(mo, id string) (*RICAlarm, error) {
        r := &RICAlarm{
-               moId:       mo,
-               appId:      id,
-               adapterUrl: ALARM_ADAPTER_HTTP_URL,
+               moId:        mo,
+               appId:       id,
+               managerUrl:  ALARM_MANAGER_HTTP_URL,
+               rmrEndpoint: ALARM_MANAGER_RMR_URL,
        }
 
-       if os.Getenv("ALARM_ADAPTER_URL") != "" {
-               r.adapterUrl = os.Getenv("ALARM_ADAPTER_URL")
+       //
+       // http service information (used in case of no rmr connectivity)
+       //
+       if os.Getenv("ALARM_MANAGER_URL") != "" {
+               r.managerUrl = os.Getenv("ALARM_MANAGER_URL")
        }
 
-       if os.Getenv("ALARM_IF_RMR") != "" {
-               go InitRMR(r)
+       if os.Getenv("ALARM_MANAGER_SERVICE_NAME") != "" && os.Getenv("ALARM_MANAGER_SERVICE_PORT") != "" {
+               r.rmrEndpoint = fmt.Sprintf("%s:%s", os.Getenv("ALARM_MANAGER_SERVICE_NAME"), os.Getenv("ALARM_MANAGER_SERVICE_PORT"))
        }
 
+       if os.Getenv("ALARM_IF_RMR") == "" {
+               if r.moId == "my-pod" {
+                       r.rmrEndpoint = "127.0.0.1:4560"
+               } else if r.moId == "my-pod-lib" {
+                       r.rmrEndpoint = "127.0.0.1:4588"
+               }
+       }
+
+       go InitRMR(r)
+
        return r, nil
 }
 
@@ -69,14 +83,14 @@ func (r *RICAlarm) NewAlarm(sp int, severity Severity, ainfo, iinfo string) Alar
                ApplicationId:     r.appId,
                SpecificProblem:   sp,
                PerceivedSeverity: severity,
-               AdditionalInfo:    ainfo,
                IdentifyingInfo:   iinfo,
+               AdditionalInfo:    ainfo,
        }
 }
 
 // Create a new AlarmMessage instance
 func (r *RICAlarm) NewAlarmMessage(a Alarm, alarmAction AlarmAction) AlarmMessage {
-       alarmTime := time.Now().UnixNano() / 1000
+       alarmTime := time.Now().UnixNano()
        return AlarmMessage{a, alarmAction, alarmTime}
 }
 
@@ -135,36 +149,63 @@ func (r *RICAlarm) AlarmString(a AlarmMessage) string {
        return fmt.Sprintf(s, a.ManagedObjectId, a.ApplicationId, a.SpecificProblem, a.PerceivedSeverity, a.IdentifyingInfo)
 }
 
-func (r *RICAlarm) sendAlarmUpdateReq(a AlarmMessage) error {
-       payload, err := json.Marshal(a)
-       if err != nil {
-               log.Println("json.Marshal failed with error: ", err)
-               return err
+func (r *RICAlarm) sendAlarmUpdateReqWithHttp(payload []byte) error {
+       url := fmt.Sprintf("%s/%s", r.managerUrl, "ric/v1/alarms")
+       resp, err := http.Post(url, "application/json", bytes.NewReader(payload))
+       if err != nil || resp == nil {
+               return fmt.Errorf("HttpError=Post failed with error: %v", err)
        }
-       log.Println("Sending alarm: ", fmt.Sprintf("%s", payload))
+       log.Printf("Alarm posted to %s [status=%d]", url, resp.StatusCode)
+       return nil
+}
 
+func (r *RICAlarm) sendAlarmUpdateReqWithRmr(payload []byte) error {
        if r.rmrCtx == nil || !r.rmrReady {
-               url := fmt.Sprintf("%s/%s", r.adapterUrl, "ric/v1/alarms")
-               resp, err := http.Post(url, "application/json", bytes.NewReader(payload))
-               if err != nil || resp == nil {
-                       return fmt.Errorf("Unable to send alarm: %v", err)
-               }
-               log.Printf("Alarm posted to %s [status=%d]", url, resp.StatusCode)
-               return nil
+               return fmt.Errorf("RmrError=rmr not ready")
        }
-
        datap := C.CBytes(payload)
        defer C.free(datap)
        meid := C.CString("ric")
        defer C.free(unsafe.Pointer(meid))
 
        if state := C.rmrSend(r.rmrCtx, RIC_ALARM_UPDATE, datap, C.int(len(payload)), meid); state != C.RMR_OK {
-               log.Println("rmrSend failed with error: ", state)
-               return errors.New(fmt.Sprintf("rmrSend failed with error: %d", state))
+               return errors.New(fmt.Sprintf("RmrError=rmrSend failed with error: %d", state))
        }
+       log.Printf("Alarm sent via rmr to %s", r.rmrEndpoint)
        return nil
 }
 
+func (r *RICAlarm) sendAlarmUpdateReq(a AlarmMessage) error {
+
+       payload, err := json.Marshal(a)
+       if err != nil {
+               log.Println("json.Marshal failed with error: ", err)
+               return err
+       }
+       log.Println("Sending alarm: ", fmt.Sprintf("%s", payload))
+
+       // --
+       // Try rmr sending
+       // --
+       err = r.sendAlarmUpdateReqWithRmr(payload)
+
+       // --
+       // Try http posting if rmr is not done for some reason: rmrSend error, rmr not initialized yet etc.
+       // --
+       if err != nil {
+               if httperr := r.sendAlarmUpdateReqWithHttp(payload); httperr != nil {
+                       err = fmt.Errorf("%s and  %s", err.Error(), httperr.Error())
+               } else {
+                       err = nil
+               }
+       }
+
+       if err != nil {
+               log.Printf("Alarm sent error %s", err.Error())
+       }
+       return err
+}
+
 func (r *RICAlarm) ReceiveMessage(cb func(AlarmMessage)) error {
        if rbuf := C.rmrRcv(r.rmrCtx); rbuf != nil {
                payload := C.GoBytes(unsafe.Pointer(rbuf.payload), C.int(rbuf.len))
@@ -178,14 +219,7 @@ func (r *RICAlarm) ReceiveMessage(cb func(AlarmMessage)) error {
 
 func InitRMR(r *RICAlarm) error {
        // Setup static RT for alarm system
-       endpoint := ALARM_ADAPTER_RMR_URL
-       if r.moId == "my-pod" {
-               endpoint = "localhost:4560"
-       } else if r.moId == "my-pod-lib" {
-               endpoint = "localhost:4588"
-       }
-
-       alarmRT := fmt.Sprintf("newrt|start\nrte|13111|%s\nnewrt|end\n", endpoint)
+       alarmRT := fmt.Sprintf("newrt|start\nrte|13111|%s\nnewrt|end\n", r.rmrEndpoint)
        alarmRTFile := "/tmp/alarm.rt"
 
        if err := ioutil.WriteFile(alarmRTFile, []byte(alarmRT), 0644); err != nil {
@@ -204,3 +238,7 @@ func InitRMR(r *RICAlarm) error {
 
        return errors.New("rmrInit failed!")
 }
+
+func (r *RICAlarm) IsRMRReady() bool {
+       return r.rmrReady
+}