From ccce3af1ff291dc85c32e5398d72b3640eb14481 Mon Sep 17 00:00:00 2001 From: Mohamed Abukar Date: Fri, 10 Apr 2020 21:43:21 +0300 Subject: [PATCH] Static RT for alarm Change-Id: I22c96a7f567657af87d15ff6e1fbb91d1517c92c Signed-off-by: Mohamed Abukar --- adapter/build_adapter_ubuntu.sh | 6 +++--- alarm/alarm.go | 21 +++++++++++++++++++++ alarm/alarm_test.go | 2 +- config/uta_rtg_lib.rt | 3 --- go.sum | 2 ++ 5 files changed, 27 insertions(+), 7 deletions(-) delete mode 100755 config/uta_rtg_lib.rt diff --git a/adapter/build_adapter_ubuntu.sh b/adapter/build_adapter_ubuntu.sh index b6e5dcc..8f0aaf4 100755 --- a/adapter/build_adapter_ubuntu.sh +++ b/adapter/build_adapter_ubuntu.sh @@ -22,11 +22,11 @@ set -eux echo "--> build_adapter_ubuntu.sh starts" # Install RMR from deb packages at packagecloud.io -rmr=rmr_3.6.3_amd64.deb +rmr=rmr_3.7.2_amd64.deb wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/$rmr/download.deb sudo dpkg -i $rmr rm $rmr -rmrdev=rmr-dev_3.6.3_amd64.deb +rmrdev=rmr-dev_3.7.2_amd64.deb wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/$rmrdev/download.deb sudo dpkg -i $rmrdev rm $rmrdev @@ -58,7 +58,7 @@ hash=$(git rev-parse --short HEAD || true) go build -a -installsuffix cgo -ldflags "-X main.Version=$tag -X main.Hash=$hash" -o alarm-adapter ./cmd/*.go # Execute UT and measure coverage for the Alarm Library -cd ../alarm && RMR_SEED_RT=../config/uta_rtg_lib.rt go test . -v -coverprofile cover.out +cd ../alarm && go test . -v -coverprofile cover.out # And for the Alarm Adapter cd ../adapter && go test -v -p 1 -coverprofile cover.out ./cmd/ -c -o ./adapter_test && ./adapter_test diff --git a/alarm/alarm.go b/alarm/alarm.go index cb18dd7..dddccb1 100755 --- a/alarm/alarm.go +++ b/alarm/alarm.go @@ -27,6 +27,8 @@ import ( "log" "time" "unsafe" + "os" + "io/ioutil" ) /* @@ -158,6 +160,25 @@ func (r *RICAlarm) ReceiveMessage(cb func(AlarmMessage)) error { } func InitRMR(r *RICAlarm) error { + // Setup static RT for alarm system + endpoint := "service-ricplt-alarmadapter-rmr.ricplt:4560" + 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) + alarmRTFile := "/tmp/alarm.rt" + + if err := ioutil.WriteFile(alarmRTFile, []byte(alarmRT), 0644); err != nil { + log.Println("ioutil.WriteFile failed with error: ", err) + return err + } + + os.Setenv("RMR_SEED_RT", alarmRTFile) + os.Setenv("RMR_RTG_SVC", "-1") + if ctx := C.rmrInit(); ctx != nil { r.rmrCtx = ctx r.rmrReady = true diff --git a/alarm/alarm_test.go b/alarm/alarm_test.go index 1f7a071..8f6ebdd 100755 --- a/alarm/alarm_test.go +++ b/alarm/alarm_test.go @@ -32,7 +32,7 @@ var alarmer *alarm.RICAlarm // Test cases func TestAlarmInitSuccess(t *testing.T) { - a, err := alarm.InitAlarm("my-pod", "my-app") + a, err := alarm.InitAlarm("my-pod-lib", "my-app") assert.Nil(t, err, "init failed") assert.Equal(t, false, a == nil) diff --git a/config/uta_rtg_lib.rt b/config/uta_rtg_lib.rt deleted file mode 100755 index 96b6be9..0000000 --- a/config/uta_rtg_lib.rt +++ /dev/null @@ -1,3 +0,0 @@ -newrt|start -rte|13111|127.0.0.1:4588 -newrt|end diff --git a/go.sum b/go.sum index 6ef3cde..8489760 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,8 @@ gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2 h1:UK7awyRKIkVdokWvvkYvazlg3EWIfM gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2/go.mod h1:y2WhrCvdLkAKdH+ySdHSOSehACJkTMyZghCGVcqoZzc= gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.0.30 h1:7fGZ2ASjHWs9FVYE8tNBVXpnbu4YKFs43pfh5B8tROc= gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.0.30/go.mod h1:lW3UYpVXwPiOR39t6JgNCE4kdmMSdPVelMPC/Pp9fQM= +gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.4.0 h1:FGQY+g9r+xxqNrU2V0VvwcpibAEgRnIAN43+4ULC8qE= +gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.4.0/go.mod h1:lW3UYpVXwPiOR39t6JgNCE4kdmMSdPVelMPC/Pp9fQM= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -- 2.16.6