commit 6f73fa33d550b6ff5ca2590757e98cec88254812
author vipin <vipin.mavila@nokia.com> Tue Oct 06 06:51:53 2020 +0000
committer vipin <vipin.mavila@nokia.com> Fri Oct 09 09:07:10 2020 +0000
tree 2de53874feb7ad32d12367eb247ee2dbf1fdcc2c
parent 2d584ac9dfe40eaa652ab8bce0a350e251b8c42a

- FM performance test tool first version for review
- Process synchronization issues resoved in alarm
  manager when handling many simultaneous posts
- Time synschronization issues handled in testcases
- Moved the performance test resources from cli to pfresources directory

Change-Id: I3f7eac3a1494e7a6abbef7232d025757456ffc4d
Signed-off-by: vipin <vipin.mavila@nokia.com>

build/Dockerfile

diff --git a/build/Dockerfile b/build/Dockerfile
index 6572c49..7e9ebc8 100755
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -35,11 +35,17 @@
 
 COPY --from=ubuntu-alarm-manager /go/src/am/build/run.sh /
 COPY --from=ubuntu-alarm-manager /go/src/am/manager/alarm-manager /
+COPY --from=ubuntu-alarm-manager /go/src/am/cli/alarm-cli /
+COPY --from=ubuntu-alarm-manager /go/src/am/perfresources/perf-alarm-object.json /
+COPY --from=ubuntu-alarm-manager /go/src/am/perfresources/perf-alarm-definition.json /
 COPY --from=ubuntu-alarm-manager /go/src/am/config/* /
 COPY --from=ubuntu-alarm-manager /usr/local/lib /usr/local/lib
 COPY --from=ubuntu-alarm-manager /go/src/am/definitions/* / 
 
 RUN ldconfig
+ENV DEF_FILE="./alarm-definition.json"
+ENV PERF_DEF_FILE="./perf-alarm-definition.json"
+ENV PERF_OBJ_FILE="./perf-alarm-object.json"
 
 RUN chmod 755 /run.sh
 CMD /run.sh

build/build_ubuntu.sh

diff --git a/build/build_ubuntu.sh b/build/build_ubuntu.sh
index 3136eca..79e5a8c 100755
--- a/build/build_ubuntu.sh
+++ b/build/build_ubuntu.sh
@@ -44,6 +44,8 @@
 
 # xApp stuff
 export DEF_FILE=../definitions/alarm-definition.json
+export PERF_DEF_FILE=../perfresources/perf-alarm-definition.json
+export PERF_OBJ_FILE=../perfresources/perf-alarm-object.json
 
 GO111MODULE=on GO_ENABLED=0 GOOS=linux
 

build/run.sh

diff --git a/build/run.sh b/build/run.sh
index 1e1ad85..697de26 100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -25,5 +25,7 @@
 export RMR_SEED_RT=./uta_rtg.rt
 export RMR_SRC_ID="service-ricplt-alarmmanager-rmr.ricplt"
 export DEF_FILE=./alarm-definition.json
+export PERF_DEF_FILE=./perf-alarm-definition.json
+export PERF_OBJ_FILE=./perf-alarm-object.json
 
 exec ./alarm-manager -f ./config-file.json

build/run_local.sh

diff --git a/build/run_local.sh b/build/run_local.sh
index 1c82c74..ddd4524 100755
--- a/build/run_local.sh
+++ b/build/run_local.sh
@@ -25,5 +25,7 @@
 export RMR_SEED_RT=$PWD/config/uta_rtg.rt
 export RMR_SRC_ID="service-ricplt-alarmmanager-rmr.ricplt"
 export DEF_FILE=$PWD/definitions/alarm-definition.json
+export PERF_DEF_FILE=$PWD/perfresources/perf-alarm-definition.json
+export PERF_OBJ_FILE=$PWD/perfresources/perf-alarm-object.json
 
 $PWD/manager/alarm-manager -f $PWD/config/config-file.json