summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-04-01 06:43:14 +0000
committerGerrit Code Review <gerrit@onap.org>2021-04-01 06:43:14 +0000
commit810890cce295aa33c1b8e2e79b2977b58837ef80 (patch)
tree759e399dc01071454be42deee65806865e0f0f97 /kubernetes
parent4ed91fa5683aa34c2f6769d63ca28b7986eb9c12 (diff)
parente30f9b9f10b24646eb28428a20aa008c66a98eaf (diff)
Merge "[CCSDK] Fix error logs due to empty URL"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/a1policymanagement/resources/config/application_configuration.json12
-rw-r--r--kubernetes/a1policymanagement/templates/_ricgen.tpl24
-rw-r--r--kubernetes/a1policymanagement/values.yaml21
3 files changed, 42 insertions, 15 deletions
diff --git a/kubernetes/a1policymanagement/resources/config/application_configuration.json b/kubernetes/a1policymanagement/resources/config/application_configuration.json
index 64c42e6cd1..6b8ebfb35e 100644
--- a/kubernetes/a1policymanagement/resources/config/application_configuration.json
+++ b/kubernetes/a1policymanagement/resources/config/application_configuration.json
@@ -8,17 +8,7 @@
"password": "${A1CONTROLLER_PASSWORD}"
}
],
- "ric": [
- {
- "name": "ric1",
- "baseUrl": "{{ .Values.ricLink }}",
- "controller": "controller1",
- "managedElementIds": [
- "kista_1",
- "kista_2"
- ]
- }
- ],
+ "ric": {{ include "a1p.generateRics" . | indent 6 | trim }},
"streams_publishes": {
"dmaap_publisher": {
"type": "message_router",
diff --git a/kubernetes/a1policymanagement/templates/_ricgen.tpl b/kubernetes/a1policymanagement/templates/_ricgen.tpl
new file mode 100644
index 0000000000..3e7371af74
--- /dev/null
+++ b/kubernetes/a1policymanagement/templates/_ricgen.tpl
@@ -0,0 +1,24 @@
+{{/*
+# Copyright © 2021 Samsung Electronics
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+{{- define "a1p.generateRics" }}
+ {{- $ricList := (list) }}
+ {{- range $ric := .Values.rics }}
+ {{- $ricItem := (dict "name" $ric.name "baseUrl" $ric.link "controller" "controller1" "managedElementIds" $ric.managedElementIds) }}
+ {{- $ricList = append $ricList $ricItem }}
+ {{- end }}
+ {{- toPrettyJson $ricList }}
+{{- end }}
diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml
index 022ef5733c..7892142de3 100644
--- a/kubernetes/a1policymanagement/values.yaml
+++ b/kubernetes/a1policymanagement/values.yaml
@@ -90,11 +90,24 @@ a1controller:
password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
sdncLink: https://sdnc.onap:8443
-# Add your own A1 Mediator link. Supports both STD & OSC Version. ex. http://<ip>:<port>
-# Alternatively you can also use the A1 simulator available in ORAN. It provides STD & OSC Version for A1 termination.
+# The information about A1-Mediator/RICs can be added here.
+# The A1 policy management service supports both STD & OSC versions.
+# Alternatively, the A1 simulator from ORAN-SC can also be used. It provides STD & OSC versions for A1 termination.
# Refer source code & run in docker container : https://gerrit.o-ran-sc.org/r/admin/repos/sim/a1-interface
-# Refer it/dep repo for k8's deployment: https://gerrit.o-ran-sc.org/r/admin/repos/it/dep
-ricLink:
+# Refer it/dep repo for k8s deployment: https://gerrit.o-ran-sc.org/r/admin/repos/it/dep
+# Example configuration:
+#rics:
+# - name: ric1
+# link: http://ric1url.url.com:1111/
+# managedElementIds:
+# - kista1
+# - kista2
+# - name: ric2
+# link: http://ric2url.url.com:2222/
+# managedElementIds:
+# - kista3
+# - kista4
+rics:
streamPublish: http://message-router:3904/events/A1-POLICY-AGENT-WRITE
streamSubscribe: http://message-router:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100