From ad41feaeb9dde8ccd6b8b508eb3df8df5d207134 Mon Sep 17 00:00:00 2001 From: Juha Hyttinen Date: Fri, 3 Apr 2020 10:11:46 +0300 Subject: [PATCH] Updates to submgr docker entrypoint Change-Id: Ibc0976b9720577d0ac670ff43ce6f24cdce8ae55 Signed-off-by: Juha Hyttinen --- Dockerfile | 11 +++++++++-- config/submgr-config.yaml | 12 ++++++++++++ config/submgr-uta-rtg.rt | 3 +++ container-tag.yaml | 2 +- pkg/teststub/controlRmr.go | 2 +- test/config-file.json | 2 +- 6 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 config/submgr-config.yaml create mode 100755 config/submgr-uta-rtg.rt diff --git a/Dockerfile b/Dockerfile index 939e0a3..34f5252 100644 --- a/Dockerfile +++ b/Dockerfile @@ -190,11 +190,18 @@ RUN apt update && apt install -y iputils-ping net-tools curl tcpdump COPY --from=submgrbuild /manifests /manifests -COPY run_submgr.sh / COPY --from=submgrbuild /opt/bin/submgr / COPY --from=submgrbuild /usr/local/include /usr/local/include COPY --from=submgrbuild /usr/local/lib /usr/local/lib RUN ldconfig +COPY run_submgr.sh / RUN chmod 755 /run_submgr.sh -CMD /run_submgr.sh + +#default config +COPY config /opt/config +ENV CFG_FILE=/opt/config/submgr-config.yaml +ENV RMR_SEED_RT=/opt/config/submgr-uta-rtg.rt + + +ENTRYPOINT ["/submgr"] diff --git a/config/submgr-config.yaml b/config/submgr-config.yaml new file mode 100644 index 0000000..919e588 --- /dev/null +++ b/config/submgr-config.yaml @@ -0,0 +1,12 @@ +"local": + "host": ":8080" +"logger": + "level": 3 +"rmr": + "protPort" : "tcp:4560" + "maxSize": 8192 + "numWorkers": 1 +"rtmgr": + "hostAddr": "localhost" + "port" : "8989" + "baseUrl" : "/ric/v1" diff --git a/config/submgr-uta-rtg.rt b/config/submgr-uta-rtg.rt new file mode 100755 index 0000000..bc06bd2 --- /dev/null +++ b/config/submgr-uta-rtg.rt @@ -0,0 +1,3 @@ +newrt|start +newrt|end + diff --git a/container-tag.yaml b/container-tag.yaml index 3f55a6f..05c006c 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -2,4 +2,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: "0.4.0-1" +tag: "0.4.0-2" diff --git a/pkg/teststub/controlRmr.go b/pkg/teststub/controlRmr.go index f47bafa..06c434b 100644 --- a/pkg/teststub/controlRmr.go +++ b/pkg/teststub/controlRmr.go @@ -46,7 +46,7 @@ func (tc *RmrControl) Init(desc string, rtfile string, port string) { tc.TestWrapper.Init(desc) os.Setenv("RMR_SEED_RT", rtfile) os.Setenv("RMR_SRC_ID", "localhost:"+port) - //os.Setenv("RMR_RTG_SVC", "localhost:"+port) + //os.Setenv("RMR_RTG_SVC", "localhost:"+rtport) xapp.Logger.Info("Using rt file %s", os.Getenv("RMR_SEED_RT")) xapp.Logger.Info("Using src id %s", os.Getenv("RMR_SRC_ID")) //xapp.Logger.Info("Using rtg svc %s", os.Getenv("RMR_RTG_SVC")) diff --git a/test/config-file.json b/test/config-file.json index a98d169..5a425dc 100644 --- a/test/config-file.json +++ b/test/config-file.json @@ -7,7 +7,7 @@ }, "rmr": { "protPort": "tcp:14560", - "maxSize": 4096, + "maxSize": 8192, "numWorkers": 1, "txMessages": ["RIC_SUB_REQ", "RIC_SUB_DEL_REQ"], "rxMessages": ["RIC_SUB_RESP", "RIC_SUB_FAILURE", "RIC_SUB_DEL_RESP", "RIC_SUB_DEL_FAILURE", "RIC_INDICATION"] -- 2.16.6