From 2d6eba1c6934167e597574dfbeb250f855c1ac8d Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Tue, 2 Jun 2020 12:46:28 -0400 Subject: [PATCH] Update for Bronze int testing Change-Id: I81c61b6a19f998b525fc42ac22fea3da3793b9ca Signed-off-by: Lusheng Ji --- RECIPE_EXAMPLE/example_recipe.yaml | 28 ++++++++++++++-------------- helm/a1mediator/templates/env.yaml | 2 +- helm/e2term/templates/service-sctp.yaml | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml index c0484b5..a3b80d9 100644 --- a/RECIPE_EXAMPLE/example_recipe.yaml +++ b/RECIPE_EXAMPLE/example_recipe.yaml @@ -57,7 +57,7 @@ extsvcplt: a1mediator: image: name: ric-plt-a1 - tag: 2.1.8 + tag: 2.1.9 rmr_timeout_config: a1_rcv_retry_times: 20 ins_del_no_resp_ttl: 5 @@ -72,7 +72,7 @@ appmgr: appmgr: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: ric-plt-appmgr - tag: 0.1.10 + tag: 0.4.3 chartmuseum: registry: "docker.io" name: chartmuseum/chartmuseum @@ -93,10 +93,10 @@ e2mgr: image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: ric-plt-e2mgr - tag: 2.0.10 + tag: 4.4.5 privilegedmode: false globalRicId: - plmnId: 131014 + plmnId: "13F184" ricNearRtId: 556670 @@ -105,7 +105,7 @@ e2term: image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: ric-plt-e2 - tag: 3.0.1 + tag: 4.4.1 privilegedmode: false hostnetworkmode: false @@ -139,9 +139,9 @@ jaegeradapter: rtmgr: image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" + registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" name: ric-plt-rtmgr - tag: 0.4.9 + tag: 0.6.0 rpe: rmrpush sbi: nngpush sbiurl: 0.0.0.0 @@ -150,29 +150,29 @@ rtmgr: submgr: image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" + registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" name: ric-plt-submgr - tag: 0.10.7 + tag: 0.4.2-1 vespamgr: image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: ric-plt-vespamgr - tag: 0.0.8 + tag: 0.4.0 prometheusurl: "http://rec-prometheus-server.default" o1mediator: image: registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" name: ric-plt-o1 - tag: 0.3.2 + tag: 0.4.4 xapponboarder: image: xapponboarder: registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" name: xapp-onboarder - tag: 1.0.0 + tag: 1.0.5 chartmuseum: registry: "docker.io" name: chartmuseum/chartmuseum @@ -182,5 +182,5 @@ xapponboarder: alarmadapter: image: registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" - name: ric-plt-alarm-go - tag: 0.4.3 + name: ric-plt-alarmadapter + tag: 0.4.4 diff --git a/helm/a1mediator/templates/env.yaml b/helm/a1mediator/templates/env.yaml index eaae74a..2361a4d 100644 --- a/helm/a1mediator/templates/env.yaml +++ b/helm/a1mediator/templates/env.yaml @@ -24,6 +24,6 @@ data: A1_RMR_RETRY_TIMES: "{{ .Values.a1mediator.rmr_timeout_config.a1_rcv_retry_times }}" # this sets the source field in messages from a1 to point back to a1s service name, rather than it's random pod name # In my private testing, this is needed! however it wasn't here in it/dep. If routing doesn't work, possibly add this back. - # RMR_SRC_ID: curlybrace curlybrace .Values.rmrservice.name curlybrace curlybrace + RMR_SRC_ID: {{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }} INSTANCE_DELETE_NO_RESP_TTL: "{{ .Values.a1mediator.rmr_timeout_config.ins_del_no_resp_ttl }}" INSTANCE_DELETE_RESP_TTL: "{{ .Values.a1mediator.rmr_timeout_config.ins_del_resp_ttl }}" diff --git a/helm/e2term/templates/service-sctp.yaml b/helm/e2term/templates/service-sctp.yaml index 1ce79e6..8efec7c 100644 --- a/helm/e2term/templates/service-sctp.yaml +++ b/helm/e2term/templates/service-sctp.yaml @@ -33,7 +33,7 @@ spec: type: NodePort ports: - port: {{ include "common.serviceport.e2term.sctp" $topCtx }} - #nodePort: 32222 + nodePort: 31888 protocol: "SCTP" targetPort: {{ include "common.serviceport.e2term.sctp" $topCtx }} name: "rmrsctp-{{ $key }}" -- 2.16.6