X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=alarm%2Falarm.go;h=f8d909af629b5ae94036a75e60a92336eaa58790;hb=3649fae7a06ad3ad099d0aa4e68f7ca3a2ae5a87;hp=25c1819bd027b9db6abde33c96b111ff65653c89;hpb=4451372acebfb8a9552e76dda73ef6c9593b797a;p=ric-plt%2Falarm-go.git

diff --git a/alarm/alarm.go b/alarm/alarm.go
index 25c1819..f8d909a 100755
--- a/alarm/alarm.go
+++ b/alarm/alarm.go
@@ -55,8 +55,10 @@ func InitAlarm(mo, id string) (*RICAlarm, error) {
 		r.managerUrl = os.Getenv("ALARM_MANAGER_URL")
 	}
 
-	if os.Getenv("ALARM_IF_RMR") != "" {
-		go InitRMR(r)
+	if os.Getenv("ALARM_IF_RMR") == "" {
+		go InitRMR(r, "")
+	} else {
+		go InitRMR(r, ALARM_MANAGER_RMR_URL)
 	}
 
 	return r, nil
@@ -76,7 +78,7 @@ func (r *RICAlarm) NewAlarm(sp int, severity Severity, ainfo, iinfo string) Alar
 
 // 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}
 }
 
@@ -136,6 +138,7 @@ func (r *RICAlarm) AlarmString(a AlarmMessage) string {
 }
 
 func (r *RICAlarm) sendAlarmUpdateReq(a AlarmMessage) error {
+
 	payload, err := json.Marshal(a)
 	if err != nil {
 		log.Println("json.Marshal failed with error: ", err)
@@ -162,6 +165,7 @@ func (r *RICAlarm) sendAlarmUpdateReq(a AlarmMessage) error {
 		log.Println("rmrSend failed with error: ", state)
 		return errors.New(fmt.Sprintf("rmrSend failed with error: %d", state))
 	}
+
 	return nil
 }
 
@@ -176,13 +180,14 @@ func (r *RICAlarm) ReceiveMessage(cb func(AlarmMessage)) error {
 	return errors.New("rmrRcv failed!")
 }
 
-func InitRMR(r *RICAlarm) error {
+func InitRMR(r *RICAlarm, endpoint string) error {
 	// Setup static RT for alarm system
-	endpoint := ALARM_MANAGER_RMR_URL
-	if r.moId == "my-pod" {
-		endpoint = "127.0.0.1:4560"
-	} else if r.moId == "my-pod-lib" {
-		endpoint = "127.0.0.1:4588"
+	if endpoint == "" {
+		if r.moId == "my-pod" {
+			endpoint = "127.0.0.1:4560"
+		} else if r.moId == "my-pod-lib" {
+			endpoint = "127.0.0.1:4588"
+		}
 	}
 
 	alarmRT := fmt.Sprintf("newrt|start\nrte|13111|%s\nnewrt|end\n", endpoint)
@@ -204,3 +209,7 @@ func InitRMR(r *RICAlarm) error {
 
 	return errors.New("rmrInit failed!")
 }
+
+func (r *RICAlarm) IsRMRReady() bool {
+	return r.rmrReady
+}