X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=alarm%2Falarm.go;h=d097c7371925bc0bd7b604a045daacf7d89ed6e1;hb=541eb50ea18ab50528420dfe724fa3d12dc24914;hp=4059b0dc725987b580ae60616b3b145a9c6d0ae0;hpb=540ceee76d8653dd7cda456083452987cfd40321;p=ric-plt%2Falarm-go.git

diff --git a/alarm/alarm.go b/alarm/alarm.go
index 4059b0d..d097c73 100755
--- a/alarm/alarm.go
+++ b/alarm/alarm.go
@@ -48,11 +48,11 @@ func InitAlarm(mo, id string) (*RICAlarm, error) {
 	r := &RICAlarm{
 		moId:       mo,
 		appId:      id,
-		adapterUrl: ALARM_ADAPTER_HTTP_URL,
+		managerUrl: ALARM_MANAGER_HTTP_URL,
 	}
 
-	if os.Getenv("ALARM_ADAPTER_URL") != "" {
-		r.adapterUrl = os.Getenv("ALARM_ADAPTER_URL")
+	if os.Getenv("ALARM_MANAGER_URL") != "" {
+		r.managerUrl = os.Getenv("ALARM_MANAGER_URL")
 	}
 
 	if os.Getenv("ALARM_IF_RMR") != "" {
@@ -76,7 +76,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}
 }
 
@@ -144,7 +144,7 @@ func (r *RICAlarm) sendAlarmUpdateReq(a AlarmMessage) error {
 	log.Println("Sending alarm: ", fmt.Sprintf("%s", payload))
 
 	if r.rmrCtx == nil || !r.rmrReady {
-		url := fmt.Sprintf("%s/%s", r.adapterUrl, "ric/v1/alarms")
+		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("Unable to send alarm: %v", err)
@@ -178,11 +178,11 @@ func (r *RICAlarm) ReceiveMessage(cb func(AlarmMessage)) error {
 
 func InitRMR(r *RICAlarm) error {
 	// Setup static RT for alarm system
-	endpoint := ALARM_ADAPTER_RMR_URL
+	endpoint := ALARM_MANAGER_RMR_URL
 	if r.moId == "my-pod" {
-		endpoint = "localhost:4560"
+		endpoint = "127.0.0.1:4560"
 	} else if r.moId == "my-pod-lib" {
-		endpoint = "localhost:4588"
+		endpoint = "127.0.0.1:4588"
 	}
 
 	alarmRT := fmt.Sprintf("newrt|start\nrte|13111|%s\nnewrt|end\n", endpoint)