Merge "[SDC] Exposing new parameters in chef config"
diff --git a/docs/helm-search.txt b/docs/helm-search.txt
index 66fddcf..c17cd25 100644
--- a/docs/helm-search.txt
+++ b/docs/helm-search.txt
@@ -1,41 +1,41 @@
NAME CHART VERSION APP VERSION DESCRIPTION
-local/onap 8.0.0 Honolulu Open Network Automation Platform (ONAP)
-local/aaf 8.0.0 ONAP Application Authorization Framework
-local/aai 8.0.0 ONAP Active and Available Inventory
-local/appc 8.0.0 Application Controller
-local/cassandra 8.0.0 ONAP cassandra
-local/cds 8.0.0 ONAP Controller Design Studio (CDS)
-local/clamp 8.0.0 ONAP Clamp
-local/cli 8.0.0 ONAP Command Line Interface
-local/common 8.0.0 Common templates for inclusion in other charts
-local/consul 8.0.0 ONAP Consul Agent
-local/contrib 8.0.0 ONAP optional tools
-local/cps 8.0.0 ONAP Configuration Persistene Service (CPS)
-local/dcaegen2 8.0.0 ONAP DCAE Gen2
-local/dgbuilder 8.0.0 D.G. Builder application
-local/dmaap 8.0.0 ONAP DMaaP components
-local/log 8.0.0 ONAP Logging ElasticStack
-local/mariadb-galera 8.0.0 Chart for MariaDB Galera cluster
-local/mongo 8.0.0 MongoDB Server
-local/msb 8.0.0 ONAP MicroServices Bus
-local/multicloud 8.0.0 ONAP multicloud broker
-local/music 8.0.0 MUSIC - Multi-site State Coordination Service
-local/mysql 8.0.0 MySQL Server
-local/nbi 8.0.0 ONAP Northbound Interface
-local/network-name-gen 8.0.0 Name Generation Micro Service
-local/nfs-provisioner 8.0.0 NFS provisioner
-local/oof 8.0.0 ONAP Optimization Framework
-local/policy 8.0.0 ONAP Policy Administration Point
-local/pomba 8.0.0 ONAP Post Orchestration Model Based Audit
-local/portal 8.0.0 ONAP Web Portal
-local/postgres 8.0.0 ONAP Postgres Server
-local/robot 8.0.0 A helm Chart for kubernetes-ONAP Robot
-local/sdc 8.0.0 Service Design and Creation Umbrella Helm charts
-local/sdnc 8.0.0 SDN Controller
-local/sdnc-prom 8.0.0 ONAP SDNC Policy Driven Ownership Management
-local/sniro-emulator 8.0.0 ONAP Mock Sniro Emulator
-local/so 8.0.0 ONAP Service Orchestrator
-local/uui 8.0.0 ONAP uui
-local/vfc 8.0.0 ONAP Virtual Function Controller (VF-C)
-local/vid 8.0.0 ONAP Virtual Infrastructure Deployment
-local/vnfsdk 8.0.0 ONAP VNF SDK
+local/onap 9.0.0 Istanbul Open Network Automation Platform (ONAP)
+local/aaf 9.0.0 ONAP Application Authorization Framework
+local/aai 9.0.0 ONAP Active and Available Inventory
+local/appc 9.0.0 Application Controller
+local/cassandra 9.0.0 ONAP cassandra
+local/cds 9.0.0 ONAP Controller Design Studio (CDS)
+local/clamp 9.0.0 ONAP Clamp
+local/cli 9.0.0 ONAP Command Line Interface
+local/common 9.0.0 Common templates for inclusion in other charts
+local/consul 9.0.0 ONAP Consul Agent
+local/contrib 9.0.0 ONAP optional tools
+local/cps 9.0.0 ONAP Configuration Persistene Service (CPS)
+local/dcaegen2 9.0.0 ONAP DCAE Gen2
+local/dgbuilder 9.0.0 D.G. Builder application
+local/dmaap 9.0.0 ONAP DMaaP components
+local/log 9.0.0 ONAP Logging ElasticStack
+local/mariadb-galera 9.0.0 Chart for MariaDB Galera cluster
+local/mongo 9.0.0 MongoDB Server
+local/msb 9.0.0 ONAP MicroServices Bus
+local/multicloud 9.0.0 ONAP multicloud broker
+local/music 9.0.0 MUSIC - Multi-site State Coordination Service
+local/mysql 9.0.0 MySQL Server
+local/nbi 9.0.0 ONAP Northbound Interface
+local/network-name-gen 9.0.0 Name Generation Micro Service
+local/nfs-provisioner 9.0.0 NFS provisioner
+local/oof 9.0.0 ONAP Optimization Framework
+local/policy 9.0.0 ONAP Policy Administration Point
+local/pomba 9.0.0 ONAP Post Orchestration Model Based Audit
+local/portal 9.0.0 ONAP Web Portal
+local/postgres 9.0.0 ONAP Postgres Server
+local/robot 9.0.0 A helm Chart for kubernetes-ONAP Robot
+local/sdc 9.0.0 Service Design and Creation Umbrella Helm charts
+local/sdnc 9.0.0 SDN Controller
+local/sdnc-prom 9.0.0 ONAP SDNC Policy Driven Ownership Management
+local/sniro-emulator 9.0.0 ONAP Mock Sniro Emulator
+local/so 9.0.0 ONAP Service Orchestrator
+local/uui 9.0.0 ONAP uui
+local/vfc 9.0.0 ONAP Virtual Function Controller (VF-C)
+local/vid 9.0.0 ONAP Virtual Infrastructure Deployment
+local/vnfsdk 9.0.0 ONAP VNF SDK
diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
index adebcba..70f5190 100644
--- a/docs/oom_cloud_setup_guide.rst
+++ b/docs/oom_cloud_setup_guide.rst
@@ -56,8 +56,8 @@
el alto 1.15.2 2.14.2 1.15.2 18.09.x
frankfurt 1.15.9 2.16.6 1.15.11 18.09.x
guilin 1.15.11 2.16.10 1.15.11 18.09.x
- Honolulu 1.19.9 3.5.2 1.19.9 19.03.x
- Istanbul 1.2.0
+ honolulu 1.19.9 3.5.2 1.19.9 19.03.x 1.2.0
+ Istanbul 1.19.11 3.6.3 1.19.11 19.03.x 1.5.4
============== =========== ======= ======== ======== ============
.. note::
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 67b5794..6b91b2c 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -27,11 +27,18 @@
* 6.0.0 for Frankfurt
* 7.0.0 for Guilin
* 8.0.0 for Honolulu
+* 9.0.0 for Istanbul
**Step 2.** Install Helm Plugins required to deploy ONAP::
> cp -R ~/oom/kubernetes/helm/plugins/ ~/.local/share/helm/plugins
- > helm plugin install https://github.com/chartmuseum/helm-push.git
+ > helm plugin install https://github.com/chartmuseum/helm-push.git \
+ --version 0.9.0
+
+.. note::
+ The ``--version 0.9.0`` is required as new version of helm (3.7.0 and up) is
+ now using ``push`` directly and helm-push is using ``cm-push`` starting
+ version ``0.10.0`` and up.
**Step 3.** Install Chartmuseum::
diff --git a/docs/oom_setup_paas.rst b/docs/oom_setup_paas.rst
index 6b7b9c3..ed632da 100644
--- a/docs/oom_setup_paas.rst
+++ b/docs/oom_setup_paas.rst
@@ -24,6 +24,7 @@
Release Cert-Manager Prometheus Stack
============== ============= =================
honolulu 1.2.0 13.x
+ istanbul 1.5.4 19.x
============== ============= =================
This guide provides instructions on how to install the PaaS
@@ -46,7 +47,7 @@
Installation steps
------------------
-The recommended version of Cert-Manager for Kubernetes 1.19 is v1.2.0.
+The recommended version of Cert-Manager for Kubernetes 1.19 is v1.5.4.
Cert-Manager is deployed using regular YAML manifests which include all
the needed resources (the CustomResourceDefinitions, cert-manager,
namespace, and the webhook component).
@@ -61,7 +62,7 @@
Installation can be as simple as::
- > kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.2.0/cert-manager.yaml
+ > kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.5.4/cert-manager.yaml
Prometheus Stack (optional)
===========================
@@ -79,8 +80,8 @@
------------------
The recommended version of kube-prometheus-stack chart for
-Kubernetes 1.19 is 13.x (which is currently the latest major chart version),
-for example 13.3.1.
+Kubernetes 1.19 is 19.x (which is currently the latest major chart version),
+for example 19.0.2.
In order to install Prometheus Stack, you must follow these steps:
@@ -100,6 +101,6 @@
> helm install prometheus prometheus-community/kube-prometheus-stack --namespace=prometheus
- To install the kube-prometheus-stack Helm chart in specific version, for example 13.3.1::
+ To install the kube-prometheus-stack Helm chart in specific version, for example 19.0.2::
- > helm install prometheus prometheus-community/kube-prometheus-stack --namespace=prometheus --version=13.3.1
+ > helm install prometheus prometheus-community/kube-prometheus-stack --namespace=prometheus --version=19.0.2
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index 3212fd3..2059251 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -204,7 +204,7 @@
To install a specific version of a single ONAP component (`so` in this example)
with the given release name enter::
- > helm deploy so onap/so --version 8.0.0 --set global.masterPassword=password --set global.flavor=unlimited --namespace onap
+ > helm deploy so onap/so --version 9.0.0 --set global.masterPassword=password --set global.flavor=unlimited --namespace onap
.. note::
The dependent components should be installed for component being installed
@@ -332,7 +332,7 @@
dependencies:
<...>
- name: so
- version: ~8.0.0
+ version: ~9.0.0
repository: '@local'
condition: so.enabled
<...>
@@ -562,10 +562,10 @@
> helm list
NAME REVISION UPDATED STATUS CHART APP VERSION NAMESPACE
- dev 1 Wed Oct 14 13:49:52 2020 DEPLOYED onap-8.0.0 Honolulu onap
- dev-cassandra 5 Thu Oct 15 14:45:34 2020 DEPLOYED cassandra-8.0.0 onap
- dev-contrib 1 Wed Oct 14 13:52:53 2020 DEPLOYED contrib-8.0.0 onap
- dev-mariadb-galera 1 Wed Oct 14 13:55:56 2020 DEPLOYED mariadb-galera-8.0.0 onap
+ dev 1 Wed Oct 14 13:49:52 2020 DEPLOYED onap-9.0.0 Istanbul onap
+ dev-cassandra 5 Thu Oct 15 14:45:34 2020 DEPLOYED cassandra-9.0.0 onap
+ dev-contrib 1 Wed Oct 14 13:52:53 2020 DEPLOYED contrib-9.0.0 onap
+ dev-mariadb-galera 1 Wed Oct 14 13:55:56 2020 DEPLOYED mariadb-galera-9.0.0 onap
Here the Name column shows the RELEASE NAME, In our case we want to try the
scale operation on cassandra, thus the RELEASE NAME would be dev-cassandra.
@@ -579,10 +579,10 @@
> helm search cassandra
NAME CHART VERSION APP VERSION DESCRIPTION
- local/cassandra 8.0.0 ONAP cassandra
- local/portal-cassandra 8.0.0 Portal cassandra
- local/aaf-cass 8.0.0 ONAP AAF cassandra
- local/sdc-cs 8.0.0 ONAP Service Design and Creation Cassandra
+ local/cassandra 9.0.0 ONAP cassandra
+ local/portal-cassandra 9.0.0 Portal cassandra
+ local/aaf-cass 9.0.0 ONAP AAF cassandra
+ local/sdc-cs 9.0.0 ONAP Service Design and Creation Cassandra
Here the Name column shows the chart name. As we want to try the scale
operation for cassandra, thus the corresponding chart name is local/cassandra
@@ -644,7 +644,7 @@
> helm list
NAME REVISION UPDATED STATUS CHART NAMESPACE
- so 1 Mon Feb 5 10:05:22 2020 DEPLOYED so-8.0.0 onap
+ so 1 Mon Feb 5 10:05:22 2020 DEPLOYED so-9.0.0 onap
When upgrading a cluster a parameter controls the minimum size of the cluster
during the upgrade while another parameter controls the maximum number of nodes
@@ -681,7 +681,7 @@
> helm history so
REVISION UPDATED STATUS CHART DESCRIPTION
1 Mon Feb 5 10:05:22 2020 SUPERSEDED so-8.0.0 Install complete
- 2 Mon Feb 5 10:10:55 2020 DEPLOYED so-8.0.1 Upgrade complete
+ 2 Mon Feb 5 10:10:55 2020 DEPLOYED so-9.0.0 Upgrade complete
Unfortunately, not all upgrades are successful. In recognition of this the
lineup of pods within an ONAP deployment is tagged such that an administrator
@@ -704,7 +704,7 @@
> helm history so
REVISION UPDATED STATUS CHART DESCRIPTION
1 Mon Feb 5 10:05:22 2020 SUPERSEDED so-8.0.0 Install complete
- 2 Mon Feb 5 10:10:55 2020 SUPERSEDED so-8.0.1 Upgrade complete
+ 2 Mon Feb 5 10:10:55 2020 SUPERSEDED so-9.0.0 Upgrade complete
3 Mon Feb 5 10:14:32 2020 DEPLOYED so-8.0.0 Rollback to 1
.. note::
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
deleted file mode 100644
index edffc4b..0000000
--- a/docs/requirements-docs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-lfdocs-conf~=0.7.5
-funcparserlib~=1.0.0a0
-sphinxcontrib.blockdiag~=2.0.0
-sphinxcontrib-needs<0.6.0
-sphinxcontrib.plantuml~=0.21
-sphinxcontrib.nwdiag~=2.0.0
-sphinxcontrib-seqdiag~=2.0.0
-sphinxcontrib-swaggerdoc~=0.1.7
-sphinx-rtd-theme~=1.0.0
diff --git a/kubernetes/a1policymanagement/Chart.yaml b/kubernetes/a1policymanagement/Chart.yaml
index 919cca8..6d0049e 100644
--- a/kubernetes/a1policymanagement/Chart.yaml
+++ b/kubernetes/a1policymanagement/Chart.yaml
@@ -1,5 +1,6 @@
################################################################################
# Copyright (c) 2020 Nordix Foundation. #
+# Modifications Copyright © 2021 Orange #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
@@ -18,4 +19,4 @@
appVersion: "1.0.0"
description: A Helm chart for A1 Policy Management Service
name: a1policymanagement
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/a1policymanagement/requirements.yaml b/kubernetes/a1policymanagement/requirements.yaml
index 401f2e3..12a8b12 100644
--- a/kubernetes/a1policymanagement/requirements.yaml
+++ b/kubernetes/a1policymanagement/requirements.yaml
@@ -1,5 +1,6 @@
################################################################################
# Copyright (c) 2020 Nordix Foundation. #
+# Modifications Copyright © 2021 Orange #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
@@ -16,14 +17,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index 25d921e..0a4168b 100644
--- a/kubernetes/aaf/Chart.yaml
+++ b/kubernetes/aaf/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 ZTE
# Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Application Authorization Framework
name: aaf
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml
index a3be84f..ab6858c 100644
--- a/kubernetes/aaf/components/aaf-cass/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cass/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF cassandra
name: aaf-cass
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml
index e89dc58..ac7f3c6 100644
--- a/kubernetes/aaf/components/aaf-cass/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cass/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml
index f5fd4ea..8d0566e 100644
--- a/kubernetes/aaf/components/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP AAF Certificate Manager
name: aaf-cm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml
index 5715c23..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-cm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cm/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-fs/Chart.yaml b/kubernetes/aaf/components/aaf-fs/Chart.yaml
index fc1f072..28c05e7 100644
--- a/kubernetes/aaf/components/aaf-fs/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-fs/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF File Server
name: aaf-fs
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-fs/requirements.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml
index 5715c23..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-fs/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-fs/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-gui/Chart.yaml b/kubernetes/aaf/components/aaf-gui/Chart.yaml
index cea5634..81a51e6 100644
--- a/kubernetes/aaf/components/aaf-gui/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-gui/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF GUI
name: aaf-gui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-gui/requirements.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-gui/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-gui/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml
index 66bf3c0..8724914 100644
--- a/kubernetes/aaf/components/aaf-hello/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-hello/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF Hello
name: aaf-hello
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-hello/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-locate/Chart.yaml b/kubernetes/aaf/components/aaf-locate/Chart.yaml
index ef8928c..947284d 100644
--- a/kubernetes/aaf/components/aaf-locate/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-locate/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF Locate
name: aaf-locate
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-locate/requirements.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-locate/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-locate/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-oauth/Chart.yaml b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
index 4b93d5f..3c48c63 100644
--- a/kubernetes/aaf/components/aaf-oauth/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF OAuth
name: aaf-oauth
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-oauth/requirements.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-oauth/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-service/Chart.yaml b/kubernetes/aaf/components/aaf-service/Chart.yaml
index a533f56..33df46f 100644
--- a/kubernetes/aaf/components/aaf-service/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-service/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF Service
name: aaf-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-service/requirements.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-service/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-service/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-sms/Chart.yaml b/kubernetes/aaf/components/aaf-sms/Chart.yaml
index df5240f..3e315fb 100644
--- a/kubernetes/aaf/components/aaf-sms/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Secret Management Service
name: aaf-sms
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
index 5eef273..2b87957 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Secret Management Service Quorum Client
name: aaf-sms-quorumclient
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
index e89dc58..ac7f3c6 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
index 77e6d12..b05165e 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
description: Chart to launch Vault as SMS backend
name: aaf-sms-vault
appVersion: 0.9.5
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
index e89dc58..ac7f3c6 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/requirements.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml
index 1876fda..0cbd2a2 100644
--- a/kubernetes/aaf/components/aaf-sms/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-sms-quorumclient
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sms-quorumclient'
- name: aaf-sms-vault
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sms-vault'
diff --git a/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json b/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
index add0808..3ede31d 100644
--- a/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
+++ b/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
@@ -99,6 +99,13 @@
"UserName": "${OSDF_OPT_ENGINE_USER}",
"Password": "${OSDF_OPT_ENGINE_PASS}"
}
+ },
+ {
+ "name": "cps",
+ "values": {
+ "UserName": "${CPS_USER}",
+ "Password": "${CPS_PASS}"
+ }
}
]
}
diff --git a/kubernetes/aaf/components/aaf-sms/templates/job.yaml b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
index 6e50620..6d9ecaa 100644
--- a/kubernetes/aaf/components/aaf-sms/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
@@ -52,6 +52,7 @@
export OSDF_OPT_ENGINE_PASS=${OSDF_OPT_ENGINE_PASS_PLAIN};
export SO_PASS=${SO_PASS_PLAIN};
export SDC_PASS=${SDC_PASS_PLAIN};
+ export CPS_PASS=${CPS_PASS_PLAIN};
cd /config-input;
for PFILE in `find . -not -type d | grep -v -F ..`; do
envsubst <${PFILE} >/config/${PFILE};
@@ -137,6 +138,11 @@
- name: SDC_PASS_PLAIN
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-creds" "key" "password") | indent 10 }}
+ - name: CPS_USER
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "login") | indent 10 }}
+ - name: CPS_PASS_PLAIN
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "password") | indent 10 }}
+
volumeMounts:
- mountPath: /config-input
name: {{ include "common.name" . }}-preload-input
diff --git a/kubernetes/aaf/components/aaf-sms/values.yaml b/kubernetes/aaf/components/aaf-sms/values.yaml
index ab7d8fb..cde8529 100644
--- a/kubernetes/aaf/components/aaf-sms/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/values.yaml
@@ -197,6 +197,12 @@
login: '{{ .Values.oofCreds.sdcUsername }}'
password: '{{ .Values.oofCreds.sdcPassword }}'
passwordPolicy: required
+ - uid: cps-creds
+ type: basicAuth
+ externalSecret: '{{ tpl (default "" .Values.oofCreds.cpsUserExternalSecret) . }}'
+ login: '{{ .Values.oofCreds.cpsUsername }}'
+ password: '{{ .Values.oofCreds.cpsPassword }}'
+ passwordPolicy: required
oofCreds:
aaiUsername: oof@oof.onap.org
aaiPassword: demo123456!
@@ -246,6 +252,10 @@
sdcUsername: aai
sdcPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ cpsUsername: ''
+ cpsPassword: ''
+ cpsUserExternalSecret: '{{ include "common.release" . }}-cps-core-app-user-creds'
+
# Configure resource requests and limits
resources:
small:
diff --git a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
index 157262b..9bf0e7b 100644
--- a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Hardware Security Components
name: aaf-sshsm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
index 63217a2..4908c68 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Resource Manager
name: aaf-sshsm-abrmd
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
index 594b12d..96c6cdd 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
index 311130e..d237c7b 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Distribution Center
name: aaf-sshsm-distcenter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
index 594b12d..96c6cdd 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
index a50d95f..baa354e 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Test CA Service
name: aaf-sshsm-testca
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
index 594b12d..96c6cdd 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
index 134666d..e39cac8 100644
--- a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-sshsm-abrmd
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sshsm-abrmd'
condition: aaf-sshsm-abrmd.enabled
- name: aaf-sshsm-distcenter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sshsm-distcenter'
condition: aaf-sshsm-distcenter.enabled
- name: aaf-sshsm-testca
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sshsm-testca'
condition: aaf-sshsm-testca.testca.enabled
diff --git a/kubernetes/aaf/components/aaf-templates/Chart.yaml b/kubernetes/aaf/components/aaf-templates/Chart.yaml
index f87e6b8..708def6 100644
--- a/kubernetes/aaf/components/aaf-templates/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml
@@ -1,5 +1,4 @@
-# Copyright © 2020 Orange
-# Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +15,4 @@
apiVersion: v1
description: ONAP Application Authorization Framework Templates
name: aaf-templates
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml
index cead078..392fda1 100644
--- a/kubernetes/aaf/components/aaf-templates/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-templates/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
index e5dd29a..2bf9b28 100644
--- a/kubernetes/aaf/requirements.yaml
+++ b/kubernetes/aaf/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
# Modifications Copyright © 2020 Nokia
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,42 +17,42 @@
dependencies:
- name: aaf-cass
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-cass'
condition: aaf-authz.enabled
- name: aaf-cm
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-cm'
condition: aaf-authz.enabled
- name: aaf-fs
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-fs'
condition: aaf-authz.enabled
- name: aaf-gui
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-gui'
condition: aaf-authz.enabled
- name: aaf-hello
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-hello'
condition: aaf-hello.enabled
- name: aaf-locate
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-locate'
condition: aaf-authz.enabled
- name: aaf-oauth
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-oauth'
condition: aaf-authz.enabled
- name: aaf-service
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-service'
condition: aaf-authz.enabled
- name: aaf-sms
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sms'
condition: aaf-sms.enabled
- name: aaf-sshsm
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sshsm'
condition: aaf-sshsm.enabled
diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 5d59ef5..8cb1846 100644
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Active and Available Inventory
name: aai
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-babel/Chart.yaml b/kubernetes/aai/components/aai-babel/Chart.yaml
index 8f6c923..f9212fa 100644
--- a/kubernetes/aai/components/aai-babel/Chart.yaml
+++ b/kubernetes/aai/components/aai-babel/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: Babel microservice
name: aai-babel
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-babel/requirements.yaml b/kubernetes/aai/components/aai-babel/requirements.yaml
index 1f3e924..a725a4e 100644
--- a/kubernetes/aai/components/aai-babel/requirements.yaml
+++ b/kubernetes/aai/components/aai-babel/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-graphadmin/Chart.yaml b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
index 911e989..4ccf89d 100644
--- a/kubernetes/aai/components/aai-graphadmin/Chart.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
@@ -3,6 +3,7 @@
# org.onap.aai
# ================================================================================
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,4 +21,4 @@
apiVersion: v1
description: ONAP AAI GraphAdmin
name: aai-graphadmin
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-graphadmin/requirements.yaml b/kubernetes/aai/components/aai-graphadmin/requirements.yaml
index 3d0f24c..d80dc5a 100644
--- a/kubernetes/aai/components/aai-graphadmin/requirements.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-modelloader/Chart.yaml b/kubernetes/aai/components/aai-modelloader/Chart.yaml
index 74b2912..31bf1bb 100644
--- a/kubernetes/aai/components/aai-modelloader/Chart.yaml
+++ b/kubernetes/aai/components/aai-modelloader/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAI modelloader
name: aai-modelloader
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-modelloader/requirements.yaml b/kubernetes/aai/components/aai-modelloader/requirements.yaml
index 3d0f24c..d80dc5a 100644
--- a/kubernetes/aai/components/aai-modelloader/requirements.yaml
+++ b/kubernetes/aai/components/aai-modelloader/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index 62e8c81..50bf63a 100644
--- a/kubernetes/aai/components/aai-resources/Chart.yaml
+++ b/kubernetes/aai/components/aai-resources/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP AAI resources
name: aai-resources
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-resources/requirements.yaml b/kubernetes/aai/components/aai-resources/requirements.yaml
index 1552d53..5a41aef 100644
--- a/kubernetes/aai/components/aai-resources/requirements.yaml
+++ b/kubernetes/aai/components/aai-resources/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 42692dd..3941af3 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -51,7 +51,7 @@
# Active spring profiles for the resources microservice
profiles:
- # aaf-auth profile will be automatically set if aaf enabled is set to true
+ # aaf-auth profile will be automatically set if aaf enabled is set to true
active: production,dmaap #,aaf-auth
# Notification event specific properties
diff --git a/kubernetes/aai/components/aai-schema-service/Chart.yaml b/kubernetes/aai/components/aai-schema-service/Chart.yaml
index c27ac5e..6dd8262 100644
--- a/kubernetes/aai/components/aai-schema-service/Chart.yaml
+++ b/kubernetes/aai/components/aai-schema-service/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP AAI Schema Service
name: aai-schema-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-schema-service/requirements.yaml b/kubernetes/aai/components/aai-schema-service/requirements.yaml
index 3d0f24c..d80dc5a 100644
--- a/kubernetes/aai/components/aai-schema-service/requirements.yaml
+++ b/kubernetes/aai/components/aai-schema-service/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-sparky-be/Chart.yaml b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
index a9ba0b2..66ac891 100644
--- a/kubernetes/aai/components/aai-sparky-be/Chart.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAI sparky-be
name: aai-sparky-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-sparky-be/requirements.yaml b/kubernetes/aai/components/aai-sparky-be/requirements.yaml
index 1552d53..5a41aef 100644
--- a/kubernetes/aai/components/aai-sparky-be/requirements.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-traversal/Chart.yaml b/kubernetes/aai/components/aai-traversal/Chart.yaml
index c21bf1b..b4acc59 100644
--- a/kubernetes/aai/components/aai-traversal/Chart.yaml
+++ b/kubernetes/aai/components/aai-traversal/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAI traversal
name: aai-traversal
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-traversal/requirements.yaml b/kubernetes/aai/components/aai-traversal/requirements.yaml
index 1552d53..5a41aef 100644
--- a/kubernetes/aai/components/aai-traversal/requirements.yaml
+++ b/kubernetes/aai/components/aai-traversal/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aai/requirements.yaml b/kubernetes/aai/requirements.yaml
index 1984399..c3c702e 100644
--- a/kubernetes/aai/requirements.yaml
+++ b/kubernetes/aai/requirements.yaml
@@ -1,5 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,52 +16,52 @@
---
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: cassandra
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
condition: global.cassandra.localCluster
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aai-babel
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aai-babel'
condition: aai-babel.enabled
- name: aai-graphadmin
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aai-graphadmin'
condition: aai-graphadmin.enabled
- name: aai-modelloader
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aai-modelloader'
condition: aai-modelloader.enabled
- name: aai-resources
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aai-resources'
condition: aai-resources.enabled
- name: aai-schema-service
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aai-schema-service'
condition: aai-schema-service.enabled
- name: aai-sparky-be
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aai-sparky-be'
condition: aai-sparky-be.enabled
- name: aai-traversal
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aai-traversal'
condition: aai-traversal.enabled
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
index 468f564..99b8388 100644
--- a/kubernetes/appc/Chart.yaml
+++ b/kubernetes/appc/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: Application Controller
name: appc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/appc/components/appc-ansible-server/Chart.yaml b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
index 95615ce..6896de0 100644
--- a/kubernetes/appc/components/appc-ansible-server/Chart.yaml
+++ b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP APPC Ansible Server
name: appc-ansible-server
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/appc/components/appc-ansible-server/requirements.yaml b/kubernetes/appc/components/appc-ansible-server/requirements.yaml
index 5b6288a..0cbc506 100644
--- a/kubernetes/appc/components/appc-ansible-server/requirements.yaml
+++ b/kubernetes/appc/components/appc-ansible-server/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/appc/components/appc-cdt/Chart.yaml b/kubernetes/appc/components/appc-cdt/Chart.yaml
index 7f29f2a..e8e4177 100644
--- a/kubernetes/appc/components/appc-cdt/Chart.yaml
+++ b/kubernetes/appc/components/appc-cdt/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP APPC Self Service Controller Design Tool
name: appc-cdt
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/appc/components/appc-cdt/requirements.yaml b/kubernetes/appc/components/appc-cdt/requirements.yaml
index 7ce274a..517e284 100644
--- a/kubernetes/appc/components/appc-cdt/requirements.yaml
+++ b/kubernetes/appc/components/appc-cdt/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml
index b4960c2..886e216 100644
--- a/kubernetes/appc/requirements.yaml
+++ b/kubernetes/appc/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dgbuilder
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: appc-ansible-server
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/appc-ansible-server'
condition: appc-ansible-server.enabled
- name: appc-cdt
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/appc-cdt'
condition: appc-cdt.enabled
diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml
index 09955ed..f2f6cc5 100644
--- a/kubernetes/cds/Chart.yaml
+++ b/kubernetes/cds/Chart.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 Orange
+# Modifications Copyright © 2018-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Controller Design Studio (CDS)
name: cds
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
index 0026707..18c18b6 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 IBM, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP CDS Blueprints Processor
name: cds-blueprints-processor
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
index baf1a76..84fa9c4 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 IBM, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,15 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
-
diff --git a/kubernetes/cds/components/cds-command-executor/Chart.yaml b/kubernetes/cds/components/cds-command-executor/Chart.yaml
index a2659f4..8d0e5f3 100755
--- a/kubernetes/cds/components/cds-command-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-command-executor/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP CDS Command Executor
name: cds-command-executor
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-command-executor/requirements.yaml b/kubernetes/cds/components/cds-command-executor/requirements.yaml
index 96ce828..59ed004 100755
--- a/kubernetes/cds/components/cds-command-executor/requirements.yaml
+++ b/kubernetes/cds/components/cds-command-executor/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
index 3ce24e2..da83516 100755
--- a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
@@ -98,7 +98,11 @@
hostPath:
path: /etc/localtime
- name: {{ include "common.fullname" . }}-blueprints
+ {{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ include "common.release" . }}-cds-blueprints
+ {{- else }}
+ emptyDir: {}
+ {{- end }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index 0f7b556..658a899 100755
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -72,7 +72,7 @@
externalPort: 10005
persistence:
- enabled: true
+ enabled: false
mountSubPath: cds/blueprints/deploy
deployedBlueprint: /opt/app/onap/blueprints/deploy
diff --git a/kubernetes/cds/components/cds-py-executor/Chart.yaml b/kubernetes/cds/components/cds-py-executor/Chart.yaml
index e4d1453..d0bfc51 100755
--- a/kubernetes/cds/components/cds-py-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-py-executor/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2020 Bell Canada, Deutsche Telekom
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP CDS Py Executor
name: cds-py-executor
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-py-executor/requirements.yaml b/kubernetes/cds/components/cds-py-executor/requirements.yaml
index 6b7064c..331a2a4 100755
--- a/kubernetes/cds/components/cds-py-executor/requirements.yaml
+++ b/kubernetes/cds/components/cds-py-executor/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2020 Bell Canada, Deutsche Telekom
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
index 9f524b2..8897062 100755
--- a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP CDS SDC listener microservice
name: cds-sdc-listener
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
index 96ce828..59ed004 100755
--- a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cds/components/cds-ui/Chart.yaml b/kubernetes/cds/components/cds-ui/Chart.yaml
index 1fb0dd5..5d40e2b 100644
--- a/kubernetes/cds/components/cds-ui/Chart.yaml
+++ b/kubernetes/cds/components/cds-ui/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP CDS UI
name: cds-ui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-ui/requirements.yaml b/kubernetes/cds/components/cds-ui/requirements.yaml
index 8f6d158..fec1da9 100644
--- a/kubernetes/cds/components/cds-ui/requirements.yaml
+++ b/kubernetes/cds/components/cds-ui/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
index 58ae5a0..c5c05bb 100644
--- a/kubernetes/cds/requirements.yaml
+++ b/kubernetes/cds/requirements.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 Orange
+# Modifications Copyright © 2018,2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,28 +15,28 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: cds-blueprints-processor
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/cds-blueprints-processor'
condition: cds-blueprints-processor.enabled
- name: cds-command-executor
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/cds-command-executor'
condition: cds-command-executor.enabled
- name: cds-py-executor
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/cds-py-executor'
condition: cds-py-executor.enabled
- name: cds-sdc-listener
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/cds-sdc-listener'
condition: cds-sdc-listener.enabled
- name: cds-ui
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/cds-ui'
condition: cds-ui.enabled
diff --git a/kubernetes/cli/Chart.yaml b/kubernetes/cli/Chart.yaml
index 469cb6d..b6c6b16 100644
--- a/kubernetes/cli/Chart.yaml
+++ b/kubernetes/cli/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Command Line Interface
name: cli
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml
index 2394a67..4f79257 100644
--- a/kubernetes/cli/requirements.yaml
+++ b/kubernetes/cli/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index 573e7d9..ea00e39 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP cassandra
name: cassandra
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml
index f2860ff..4189d43 100644
--- a/kubernetes/common/cassandra/requirements.yaml
+++ b/kubernetes/common/cassandra/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/cert-wrapper/Chart.yaml b/kubernetes/common/cert-wrapper/Chart.yaml
index ef18eaa..242bb46 100644
--- a/kubernetes/common/cert-wrapper/Chart.yaml
+++ b/kubernetes/common/cert-wrapper/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Wrapper chart to allow truststore to be shared among cert-initializer instances
name: cert-wrapper
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/cert-wrapper/requirements.yaml b/kubernetes/common/cert-wrapper/requirements.yaml
index 744d81f..08cf530 100644
--- a/kubernetes/common/cert-wrapper/requirements.yaml
+++ b/kubernetes/common/cert-wrapper/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../certInitializer'
diff --git a/kubernetes/common/certInitializer/Chart.yaml b/kubernetes/common/certInitializer/Chart.yaml
index 371023b..0ed89d4 100644
--- a/kubernetes/common/certInitializer/Chart.yaml
+++ b/kubernetes/common/certInitializer/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Template used to obtain certificates in onap
name: certInitializer
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml
index 78775ae..96b54cd 100644
--- a/kubernetes/common/certInitializer/requirements.yaml
+++ b/kubernetes/common/certInitializer/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../readinessCheck'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/certManagerCertificate/Chart.yaml b/kubernetes/common/certManagerCertificate/Chart.yaml
index 8c0113b..84b9670 100644
--- a/kubernetes/common/certManagerCertificate/Chart.yaml
+++ b/kubernetes/common/certManagerCertificate/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2021 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
name: certManagerCertificate
description: A Helm chart for Cert-Manager Certificate CRD template
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/certManagerCertificate/requirements.yaml b/kubernetes/common/certManagerCertificate/requirements.yaml
index 83becb0..42420ce 100644
--- a/kubernetes/common/certManagerCertificate/requirements.yaml
+++ b/kubernetes/common/certManagerCertificate/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2021 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: cmpv2Config
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../cmpv2Config'
diff --git a/kubernetes/common/cmpv2Config/Chart.yaml b/kubernetes/common/cmpv2Config/Chart.yaml
index bac8276..fb1c2d2 100644
--- a/kubernetes/common/cmpv2Config/Chart.yaml
+++ b/kubernetes/common/cmpv2Config/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Template used to store cmpv2 configuration in onap
name: cmpv2Config
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/cmpv2Config/requirements.yaml b/kubernetes/common/cmpv2Config/requirements.yaml
index 5a100d3..f5c9d0c 100644
--- a/kubernetes/common/cmpv2Config/requirements.yaml
+++ b/kubernetes/common/cmpv2Config/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index f184cb9..1307a8a 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Common templates for inclusion in other charts
name: common
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index 0f2b546..8f56294 100644
--- a/kubernetes/common/dgbuilder/Chart.yaml
+++ b/kubernetes/common/dgbuilder/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: D.G. Builder application
name: dgbuilder
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
index 1bbab11..5e56fe7 100644
--- a/kubernetes/common/dgbuilder/requirements.yaml
+++ b/kubernetes/common/dgbuilder/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml
index 494aaf0..225e6c3 100644
--- a/kubernetes/common/elasticsearch/Chart.yaml
+++ b/kubernetes/common/elasticsearch/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP elasticsearch
name: elasticsearch
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
index d113870..1e51fec 100644
--- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP elasticsearch curator
name: curator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/elasticsearch/components/curator/requirements.yaml b/kubernetes/common/elasticsearch/components/curator/requirements.yaml
index d7bac0b..e917076 100644
--- a/kubernetes/common/elasticsearch/components/curator/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml
index 65251f6..2218bef 100644
--- a/kubernetes/common/elasticsearch/components/data/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP elasticsearch data
name: data
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/elasticsearch/components/data/requirements.yaml b/kubernetes/common/elasticsearch/components/data/requirements.yaml
index 3a52cbe..6212efa 100644
--- a/kubernetes/common/elasticsearch/components/data/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/data/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml
index f3fa699..49ed5d0 100644
--- a/kubernetes/common/elasticsearch/components/master/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,4 +18,4 @@
apiVersion: v1
description: ONAP elasticsearch master
name: master
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/elasticsearch/components/master/requirements.yaml b/kubernetes/common/elasticsearch/components/master/requirements.yaml
index 3a52cbe..6212efa 100644
--- a/kubernetes/common/elasticsearch/components/master/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/master/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/requirements.yaml b/kubernetes/common/elasticsearch/requirements.yaml
index e252569..c41b360 100644
--- a/kubernetes/common/elasticsearch/requirements.yaml
+++ b/kubernetes/common/elasticsearch/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: master
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/master'
- name: data
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/data'
condition: elasticsearch.data.enabled,data.enabled
- name: curator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/curator'
condition: elasticsearch.curator.enabled,curator.enabled
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../certInitializer'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/etcd-init/Chart.yaml b/kubernetes/common/etcd-init/Chart.yaml
index 20f5ac4..065d3da 100644
--- a/kubernetes/common/etcd-init/Chart.yaml
+++ b/kubernetes/common/etcd-init/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Chart for etcd init job
name: etcd-init
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/etcd-init/requirements.yaml b/kubernetes/common/etcd-init/requirements.yaml
index 008789b..a8c99d6 100644
--- a/kubernetes/common/etcd-init/requirements.yaml
+++ b/kubernetes/common/etcd-init/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index 72d7bdb..1e09089 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 Intel Corporation
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
apiVersion: v1
name: etcd
home: https://github.com/coreos/etcd
-version: 8.0.0
+version: 9.0.0
appVersion: 2.2.5
description: Distributed reliable key-value store for the most critical data of a
distributed system.
diff --git a/kubernetes/common/etcd/requirements.yaml b/kubernetes/common/etcd/requirements.yaml
index da0ef74..48ff493 100644
--- a/kubernetes/common/etcd/requirements.yaml
+++ b/kubernetes/common/etcd/requirements.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 Orange
+# Modifications Copyright © 2018,2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
# limitations under the License
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/logConfiguration/Chart.yaml b/kubernetes/common/logConfiguration/Chart.yaml
index 1d1678e..1862804 100644
--- a/kubernetes/common/logConfiguration/Chart.yaml
+++ b/kubernetes/common/logConfiguration/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Template used to create same STDOUT log configuration
name: logConfiguration
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/logConfiguration/requirements.yaml b/kubernetes/common/logConfiguration/requirements.yaml
index 6bd7f98..8af6712 100644
--- a/kubernetes/common/logConfiguration/requirements.yaml
+++ b/kubernetes/common/logConfiguration/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index 2905b31..0616951 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Copyright © 2020 Bitnami, Orange
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
apiVersion: v1
description: Chart for MariaDB Galera cluster
name: mariadb-galera
-version: 8.0.0
+version: 9.0.0
keywords:
- mariadb
- mysql
diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml
index cec7a1b..767336e 100644
--- a/kubernetes/common/mariadb-galera/requirements.yaml
+++ b/kubernetes/common/mariadb-galera/requirements.yaml
@@ -1,5 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../readinessCheck'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml
index 2c679ff..357a683 100644
--- a/kubernetes/common/mariadb-init/Chart.yaml
+++ b/kubernetes/common/mariadb-init/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Chart for MariaDB Galera init job
name: mariadb-init
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/mariadb-init/requirements.yaml b/kubernetes/common/mariadb-init/requirements.yaml
index 0a1d9f3..da8305e 100644
--- a/kubernetes/common/mariadb-init/requirements.yaml
+++ b/kubernetes/common/mariadb-init/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml
index ad35ea0..84e1ea6 100644
--- a/kubernetes/common/mongo/Chart.yaml
+++ b/kubernetes/common/mongo/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2018 Orange
+# Copyright © 2018, 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
apiVersion: v1
description: MongoDB Server
name: mongo
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml
index ba0feec..c791c85 100644
--- a/kubernetes/common/mongo/requirements.yaml
+++ b/kubernetes/common/mongo/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml
index 7ba72ef..9ac168e 100644
--- a/kubernetes/common/music/Chart.yaml
+++ b/kubernetes/common/music/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: MUSIC - Multi-site State Coordination Service
name: music
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/music/components/music-cassandra/Chart.yaml b/kubernetes/common/music/components/music-cassandra/Chart.yaml
index 2e4be22..aa97c71 100644
--- a/kubernetes/common/music/components/music-cassandra/Chart.yaml
+++ b/kubernetes/common/music/components/music-cassandra/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP - Cassandra Database
name: music-cassandra
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/music/components/music-cassandra/requirements.yaml b/kubernetes/common/music/components/music-cassandra/requirements.yaml
index 4e8a85a..5fa28a7 100644
--- a/kubernetes/common/music/components/music-cassandra/requirements.yaml
+++ b/kubernetes/common/music/components/music-cassandra/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/music/requirements.yaml b/kubernetes/common/music/requirements.yaml
index d16ce06..e65219c 100644
--- a/kubernetes/common/music/requirements.yaml
+++ b/kubernetes/common/music/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: music-cassandra
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/music-cassandra'
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../certInitializer'
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml
index 173dd33..3f54927 100644
--- a/kubernetes/common/network-name-gen/Chart.yaml
+++ b/kubernetes/common/network-name-gen/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Name Generation Micro Service
name: network-name-gen
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml
index e543bc6..88b6a3d 100644
--- a/kubernetes/common/network-name-gen/requirements.yaml
+++ b/kubernetes/common/network-name-gen/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../mariadb-galera'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../mariadb-init'
condition: not global.mariadbGalera.localCluster
diff --git a/kubernetes/common/postgres-init/.helmignore b/kubernetes/common/postgres-init/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/kubernetes/common/postgres-init/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/kubernetes/common/postgres-init/Chart.yaml b/kubernetes/common/postgres-init/Chart.yaml
new file mode 100644
index 0000000..7cf3861
--- /dev/null
+++ b/kubernetes/common/postgres-init/Chart.yaml
@@ -0,0 +1,18 @@
+# Copyright © 2021 Orange
+#
+# 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.
+
+apiVersion: v1
+description: Chart for Postgres init job
+name: postgres-init
+version: 9.0.0
diff --git a/kubernetes/common/postgres-init/requirements.yaml b/kubernetes/common/postgres-init/requirements.yaml
new file mode 100644
index 0000000..1bc4675
--- /dev/null
+++ b/kubernetes/common/postgres-init/requirements.yaml
@@ -0,0 +1,21 @@
+# Copyright © 2021 Orange
+#
+# 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.
+
+dependencies:
+ - name: common
+ version: ~9.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~9.x-0
+ repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/postgres-init/resources/config/setup.sql b/kubernetes/common/postgres-init/resources/config/setup.sql
new file mode 100644
index 0000000..06e0724
--- /dev/null
+++ b/kubernetes/common/postgres-init/resources/config/setup.sql
@@ -0,0 +1,19 @@
+--- User Setup
+CREATE USER "${PG_USER}" LOGIN;
+ALTER USER "${PG_USER}" PASSWORD '${PG_PASSWORD}';
+
+CREATE DATABASE ${PG_DATABASE};
+GRANT ALL PRIVILEGES ON DATABASE ${PG_DATABASE} TO "${PG_USER}";
+
+--- PG_DATABASE Setup
+
+\c ${PG_DATABASE}
+
+CREATE EXTENSION IF NOT EXISTS pg_stat_statements;
+CREATE EXTENSION IF NOT EXISTS pgaudit;
+
+--- Create schema for PG_USER
+
+\c ${PG_DATABASE}
+
+CREATE SCHEMA IF NOT EXISTS "${PG_USER}" AUTHORIZATION "${PG_USER}";
diff --git a/kubernetes/common/postgres-init/templates/configmap.yaml b/kubernetes/common/postgres-init/templates/configmap.yaml
new file mode 100644
index 0000000..66c28a0
--- /dev/null
+++ b/kubernetes/common/postgres-init/templates/configmap.yaml
@@ -0,0 +1,29 @@
+{{/*
+# Copyright © 2021 Orange
+#
+#
+# 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.
+*/}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/common/postgres-init/templates/job.yaml b/kubernetes/common/postgres-init/templates/job.yaml
new file mode 100644
index 0000000..01151bb
--- /dev/null
+++ b/kubernetes/common/postgres-init/templates/job.yaml
@@ -0,0 +1,121 @@
+{{/*
+# Copyright © 2021 Orange
+#
+# 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.
+*/}}
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+ name: {{ include "common.fullname" . }}-config-job
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+spec:
+ backoffLimit: 20
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.name" . }}
+ release: {{ include "common.release" . }}
+ name: {{ include "common.name" . }}
+ spec:
+ initContainers:
+ - name: {{ include "common.name" . }}-readiness
+ command:
+ - /app/ready.py
+ args:
+ - --container-name
+ - {{ .Values.global.postgres.container.name }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ include "repositoryGenerator.image.readiness" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ containers:
+ - command:
+ - sh
+ args:
+ - -c
+ - |
+ function prepare_password {
+ echo -n $1 | sed -e "s/'/''/g"
+ }
+ export PG_PASSWORD=`prepare_password $PG_PASSWORD_INPUT`;
+ export PG_ROOT_PASSWORD=`prepare_password $PG_ROOT_PASSWORD_INPUT`;
+ cd /config-input && for PFILE in `ls -1 .`; do envsubst <${PFILE} >/config/${PFILE}; done;
+ psql "postgresql://postgres:$PG_ROOT_PASSWORD@$PG_HOST" < /config/setup.sql
+ env:
+ - name: PG_HOST
+ value: "{{ .Values.global.postgres.service.name2 }}"
+ - name: PG_PRIMARY_USER
+ value: primaryuser
+ - name: MODE
+ value: postgres
+ - name: PG_PRIMARY_PASSWORD_INPUT
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" (include "common.postgres.secret.primaryPasswordUID" .) "key" "password") | indent 10 }}
+ - name: PG_USER
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" (include "common.postgres.secret.userCredentialsUID" .) "key" "login") | indent 10 }}
+ - name: PG_PASSWORD_INPUT
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" (include "common.postgres.secret.userCredentialsUID" .) "key" "password") | indent 10 }}
+ - name: PG_DATABASE
+ value: "{{ .Values.config.pgDatabase }}"
+ - name: PG_ROOT_PASSWORD_INPUT
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 10 }}
+ volumeMounts:
+ - mountPath: /config-input/setup.sql
+ name: config
+ subPath: setup.sql
+ - mountPath: /config
+ name: pgconf
+ image: {{ include "repositoryGenerator.image.postgres" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-update-config
+ volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
+ - mountPath: /config-input/setup.sql
+ name: config
+ subPath: setup.sql
+ - mountPath: /config
+ name: pgconf
+ resources:
+{{ include "common.resources" . | indent 12 }}
+ {{- if .Values.nodeSelector }}
+ nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 10 }}
+ {{- end -}}
+ {{- if .Values.affinity }}
+ affinity:
+{{ toYaml .Values.affinity | indent 10 }}
+ {{- end }}
+ volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
+ - name: config
+ configMap:
+ name: {{ include "common.fullname" . }}
+ - name: pgconf
+ emptyDir:
+ medium: Memory
+ restartPolicy: Never
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/common/postgres-init/templates/secrets.yaml b/kubernetes/common/postgres-init/templates/secrets.yaml
new file mode 100644
index 0000000..f3bea1f
--- /dev/null
+++ b/kubernetes/common/postgres-init/templates/secrets.yaml
@@ -0,0 +1,16 @@
+{{/*
+# Copyright © 2021 Orange
+# #
+# # 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.
+*/}}
+{{ include "common.secretFast" . }}
diff --git a/kubernetes/common/postgres-init/values.yaml b/kubernetes/common/postgres-init/values.yaml
new file mode 100644
index 0000000..7bcd8e2
--- /dev/null
+++ b/kubernetes/common/postgres-init/values.yaml
@@ -0,0 +1,91 @@
+# Copyright © 2021 Orange
+#
+# 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.
+
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ postgres:
+ service:
+ name: pgset
+ container:
+ name: postgres
+
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+ - uid: '{{ include "common.postgres.secret.rootPassUID" . }}'
+ type: password
+ externalSecret: '{{ tpl (default "" .Values.config.pgRootPasswordExternalSecret) . }}'
+ password: '{{ .Values.config.pgRootPassword }}'
+ - uid: '{{ include "common.postgres.secret.userCredentialsUID" . }}'
+ type: basicAuth
+ externalSecret: '{{ tpl (default "" .Values.config.pgUserExternalSecret) . }}'
+ login: '{{ .Values.config.pgUserName }}'
+ password: '{{ .Values.config.pgUserPassword }}'
+ - uid: '{{ include "common.postgres.secret.primaryPasswordUID" . }}'
+ type: password
+ externalSecret: '{{ tpl (default "" .Values.config.pgPrimaryPasswordExternalSecret) . }}'
+ password: '{{ .Values.config.pgPrimaryPassword }}'
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+
+pullPolicy: Always
+
+# application configuration
+config:
+ pgUserName: testuser
+ pgDatabase: userdb
+ pgDataPath: data
+ pgRootPasswordExternalSecret: '{{ include "common.namespace" . }}-postgres-db-root-password'
+ # pgPrimaryPassword: password
+ # pgUserPassword: password
+ # pgRootPassword: password
+
+nodeSelector: {}
+
+affinity: {}
+
+flavor: small
+
+#resources: {}
+# We usually recommend not to specify default resources and to leave this as a conscious
+# choice for the user. This also increases chances charts run on environments with little
+# resources, such as Minikube. If you do want to specify resources, uncomment the following
+# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+#
+# Example:
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
+# Minimum memory for development is 2 CPU cores and 4GB memory
+# Minimum memory for production is 4 CPU cores and 8GB memory
+resources:
+ small:
+ limits:
+ cpu: 100m
+ memory: 300Mi
+ requests:
+ cpu: 10m
+ memory: 90Mi
+ large:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 1
+ memory: 2Gi
+ unlimited: {}
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index 26c55c7..b0759a5 100644
--- a/kubernetes/common/postgres/Chart.yaml
+++ b/kubernetes/common/postgres/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, AT&T, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Postgres Server
name: postgres
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml
index 7d04073..8f1f327 100644
--- a/kubernetes/common/postgres/requirements.yaml
+++ b/kubernetes/common/postgres/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, AT&T, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/postgres/templates/_deployment.tpl b/kubernetes/common/postgres/templates/_deployment.tpl
index d93d401..341b4c8 100644
--- a/kubernetes/common/postgres/templates/_deployment.tpl
+++ b/kubernetes/common/postgres/templates/_deployment.tpl
@@ -1,6 +1,7 @@
{{/*
# Copyright © 2018 Amdocs, AT&T, Bell Canada
# Copyright © 2020 Samsung Electronics
+# Copyright © 2021 Orange
# Modifications Copyright (C) 2021 Bell Canada.
# #
# # Licensed under the Apache License, Version 2.0 (the "License");
@@ -126,9 +127,9 @@
- name: PG_MODE
value: {{ $pgMode }}
- name: PG_PRIMARY_HOST
- value: "{{ $dot.Values.container.name.primary }}"
+ value: "{{ $dot.Values.service.name2 }}"
- name: PG_REPLICA_HOST
- value: "{{ $dot.Values.container.name.replica }}"
+ value: "{{ $dot.Values.service.name3 }}"
- name: PG_PRIMARY_PORT
value: "{{ $dot.Values.service.internalPort }}"
- name: PG_PRIMARY_PASSWORD
diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml
index 842dd7d..86aa152 100644
--- a/kubernetes/common/readinessCheck/Chart.yaml
+++ b/kubernetes/common/readinessCheck/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Template used to wait for other deployment/sts/jobs in onap
name: readinessCheck
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/readinessCheck/requirements.yaml b/kubernetes/common/readinessCheck/requirements.yaml
index 0a1d9f3..da8305e 100644
--- a/kubernetes/common/readinessCheck/requirements.yaml
+++ b/kubernetes/common/readinessCheck/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/repository-wrapper/Chart.yaml b/kubernetes/common/repository-wrapper/Chart.yaml
index 6018f6a..381e451 100644
--- a/kubernetes/common/repository-wrapper/Chart.yaml
+++ b/kubernetes/common/repository-wrapper/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Wrapper chart to allow docker secret to be shared all instances
name: repository-wrapper
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/repository-wrapper/requirements.yaml b/kubernetes/common/repository-wrapper/requirements.yaml
index 0a1d9f3..da8305e 100644
--- a/kubernetes/common/repository-wrapper/requirements.yaml
+++ b/kubernetes/common/repository-wrapper/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/repositoryGenerator/Chart.yaml b/kubernetes/common/repositoryGenerator/Chart.yaml
index fc10b1b..24d9f59 100644
--- a/kubernetes/common/repositoryGenerator/Chart.yaml
+++ b/kubernetes/common/repositoryGenerator/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Template used to generate the right repository link
name: repositoryGenerator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/roles-wrapper/Chart.yaml b/kubernetes/common/roles-wrapper/Chart.yaml
index 862773f..0e4ba0b 100644
--- a/kubernetes/common/roles-wrapper/Chart.yaml
+++ b/kubernetes/common/roles-wrapper/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Wrapper chart to allow default roles to be shared among onap instances
name: roles-wrapper
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/roles-wrapper/requirements.yaml b/kubernetes/common/roles-wrapper/requirements.yaml
index b2d51ef..102e006 100644
--- a/kubernetes/common/roles-wrapper/requirements.yaml
+++ b/kubernetes/common/roles-wrapper/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml
index 034e5ee..54ab969 100644
--- a/kubernetes/common/serviceAccount/Chart.yaml
+++ b/kubernetes/common/serviceAccount/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Template used to create the right Service Accounts / Role / RoleBinding
name: serviceAccount
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/serviceAccount/requirements.yaml b/kubernetes/common/serviceAccount/requirements.yaml
index 6bd7f98..8af6712 100644
--- a/kubernetes/common/serviceAccount/requirements.yaml
+++ b/kubernetes/common/serviceAccount/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../common'
diff --git a/kubernetes/common/timescaledb/Chart.yaml b/kubernetes/common/timescaledb/Chart.yaml
index 7aeafa0..e2e9e7d 100644
--- a/kubernetes/common/timescaledb/Chart.yaml
+++ b/kubernetes/common/timescaledb/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2021 Bell Canada.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,4 +21,4 @@
appVersion: "1.0"
description: ONAP timescaledb
name: timescaledb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/timescaledb/requirements.yaml b/kubernetes/common/timescaledb/requirements.yaml
index de0c414..1bcd103 100644
--- a/kubernetes/common/timescaledb/requirements.yaml
+++ b/kubernetes/common/timescaledb/requirements.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2021 Bell Canada.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/timescaledb/templates/statefulset.yaml b/kubernetes/common/timescaledb/templates/statefulset.yaml
index 0bd7d30..a3d942f 100644
--- a/kubernetes/common/timescaledb/templates/statefulset.yaml
+++ b/kubernetes/common/timescaledb/templates/statefulset.yaml
@@ -30,6 +30,22 @@
spec:
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . ) }}
{{ include "common.podSecurityContext" . | indent 10 | trim}}
+ initContainers:
+ # we shouldn't need this but for unknown reason, it's fsGroup is not
+ # applied
+ - name: fix-permission
+ command:
+ - /bin/sh
+ args:
+ - -c
+ - chown -R {{ .Values.securityContext.user_id }}:{{ .Values.securityContext.group_id }} /var/lib/postgresql/data
+ image: {{ include "repositoryGenerator.image.busybox" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ securityContext:
+ runAsUser: 0
+ volumeMounts:
+ - mountPath: /var/lib/postgresql/data
+ name: {{ include "common.fullname" . }}
containers:
- name: {{ include "common.name" . }}
image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
index 970ab43..19c0182 100644
--- a/kubernetes/consul/Chart.yaml
+++ b/kubernetes/consul/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Consul Agent
name: consul
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/consul/components/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
index fe5546c..466bbc6 100644
--- a/kubernetes/consul/components/consul-server/Chart.yaml
+++ b/kubernetes/consul/components/consul-server/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Consul Server
name: consul-server
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/consul/components/consul-server/requirements.yaml b/kubernetes/consul/components/consul-server/requirements.yaml
index e43236d..3ad1b35 100644
--- a/kubernetes/consul/components/consul-server/requirements.yaml
+++ b/kubernetes/consul/components/consul-server/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml
index 1312294..a0b33cc 100644
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,18 +16,18 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: consul-server
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/consul-server'
condition: consul-server.enabled
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml
index 1ab79d9..2df075a 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP optional tools
name: contrib
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml
index 46a0d18..6b7fb60 100755
--- a/kubernetes/contrib/components/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,4 +18,4 @@
name: awx
sources:
- https://github.com/ansible/awx
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
index d21f2d4..66bf12e 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Ansible AWX database
name: awx-postgres
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
index b7c4d1e..eae0750 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml
index 222db38..8e588f5 100755
--- a/kubernetes/contrib/components/awx/requirements.yaml
+++ b/kubernetes/contrib/components/awx/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: awx-postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/awx-postgres'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/awx/templates/serviceaccout.yaml b/kubernetes/contrib/components/awx/templates/serviceaccount.yaml
similarity index 100%
rename from kubernetes/contrib/components/awx/templates/serviceaccout.yaml
rename to kubernetes/contrib/components/awx/templates/serviceaccount.yaml
diff --git a/kubernetes/contrib/components/awx/templates/statefulset.yaml b/kubernetes/contrib/components/awx/templates/statefulset.yaml
index 9910aa4..1f2c093 100644
--- a/kubernetes/contrib/components/awx/templates/statefulset.yaml
+++ b/kubernetes/contrib/components/awx/templates/statefulset.yaml
@@ -180,7 +180,7 @@
cpu: 500m
memory: 1Gi
serviceAccount: {{ include "common.fullname" . }}
- serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
+ serviceAccountName: {{ include "common.fullname" . }}
volumes:
- configMap:
defaultMode: 420
diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml
index 2a0b4f3..638c6db 100644
--- a/kubernetes/contrib/components/ejbca/Chart.yaml
+++ b/kubernetes/contrib/components/ejbca/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP EJBCA test server
name: ejbca
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml
index 284108c..dabf474 100644
--- a/kubernetes/contrib/components/ejbca/requirements.yaml
+++ b/kubernetes/contrib/components/ejbca/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Orange, Ericsson
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,22 +14,22 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: cmpv2Config
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml
index 43d82f4..a580269 100755
--- a/kubernetes/contrib/components/netbox/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Netbox IPAM
name: netbox
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
index 8fa1585..d274160 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Netbox - Application (WSGI + Gunicorn)
name: netbox-app
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
index 1b6f2d7..0bfe137 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
index d7e8218..af54335 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Netbox - Nginx web server
name: netbox-nginx
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
index 1b6f2d7..0bfe137 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
index 5e4a792..435c7e2 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: Netbox Posgres database
name: netbox-postgres
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
index 1b6f2d7..0bfe137 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml
index 7b63a82..467b6cf 100755
--- a/kubernetes/contrib/components/netbox/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: netbox-app
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/netbox-app'
- name: netbox-nginx
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/netbox-nginx'
- name: netbox-postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/netbox-postgres'
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
index 20573f8..c6d0a19 100644
--- a/kubernetes/contrib/requirements.yaml
+++ b/kubernetes/contrib/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: awx
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/awx'
condition: awx.enabled
- name: ejbca
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/ejbca'
condition: global.cmpv2Enabled
- name: netbox
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/netbox'
condition: netbox.enabled
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cps/Chart.yaml b/kubernetes/cps/Chart.yaml
index 0837c72..fe80457 100644
--- a/kubernetes/cps/Chart.yaml
+++ b/kubernetes/cps/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2021 Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Configuration Persistance Service (CPS)
name: cps
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml
index 7100328..2d9274e 100644
--- a/kubernetes/cps/components/cps-core/Chart.yaml
+++ b/kubernetes/cps/components/cps-core/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (C) Pantheon.tech, Orange
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Configuration Persistance Service (CPS) - Core
name: cps-core
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/cps-core/requirements.yaml b/kubernetes/cps/components/cps-core/requirements.yaml
index d6b6712..8a4ffbe 100644
--- a/kubernetes/cps/components/cps-core/requirements.yaml
+++ b/kubernetes/cps/components/cps-core/requirements.yaml
@@ -14,17 +14,23 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
+ condition: global.postgres.localCluster
+ - name: postgres-init
+ version: ~9.x-0
+ repository: '@local'
+ condition: not global.postgres.localCluster
+ #condition: global.postgres.postgresInit
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
index 0bc7d5b..8f904ef 100644
--- a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
@@ -2,6 +2,7 @@
# Copyright (C) 2021 Pantheon.tech
# Modifications Copyright (C) 2020 Bell Canada.
# Modifications Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright (C) 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +19,11 @@
spring:
datasource:
+{{- if .Values.global.postgres.localCluster }}
url: jdbc:postgresql://{{ .Values.postgres.service.name2 }}:5432/{{ .Values.postgres.config.pgDatabase }}
+{{- else }}
+ url: jdbc:postgresql://{{ .Values.global.postgres.service.name2 }}:5432/{{ .Values.postgres.config.pgDatabase }}
+{{- end }}
username: ${DB_USERNAME}
password: ${DB_PASSWORD}
driverClassName: org.postgresql.Driver
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 4f788e7..d41c44d 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -52,8 +52,18 @@
ingress:
virtualhost:
baseurl: "simpledemo.onap.org"
+ #Service Names of the postgres db to connect to.
+ #Override it to cps-postgres if localCluster is enabled.
+ postgres:
+ localCluster: false
+ service:
+ name: pgset
+ name2: tcp-pgset-primary
+ name3: tcp-pgset-replica
+ container:
+ name: postgres
-image: onap/cps-and-ncmp:2.0.0
+image: onap/cps-and-ncmp:2.0.1
containerPort: &svc_port 8080
managementPort: &mgt_port 8081
@@ -206,9 +216,21 @@
pgUserExternalSecret: *pgUserCredsSecretName
pgRootPasswordExternalSecret: *pgRootPassSecretName
+postgres-init:
+ nameOverride: cps-postgres-init
+ config:
+ pgUserName: cps
+ pgDatabase: cpsdb
+ pgDataPath: data
+ pgUserExternalSecret: *pgUserCredsSecretName
+
+ # pgPrimaryPassword: password
+ # pgUserPassword: password
+ # pgRootPassword: password
+
readinessCheck:
wait_for:
- - *postgresName
+ - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
minReadySeconds: 10
updateStrategy:
diff --git a/kubernetes/cps/components/cps-temporal/Chart.yaml b/kubernetes/cps/components/cps-temporal/Chart.yaml
index ab4bfe7..99ff422 100644
--- a/kubernetes/cps/components/cps-temporal/Chart.yaml
+++ b/kubernetes/cps/components/cps-temporal/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2021 Bell Canada.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Configuration Persistance Service (CPS) - Temporal
name: cps-temporal
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/cps-temporal/requirements.yaml b/kubernetes/cps/components/cps-temporal/requirements.yaml
index b2293db..442261d 100644
--- a/kubernetes/cps/components/cps-temporal/requirements.yaml
+++ b/kubernetes/cps/components/cps-temporal/requirements.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2021 Bell Canada.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,17 +19,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: timescaledb
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
index e99111d..729eeb2 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Configuration Persistance Service (CPS) - NCMP-DMI-Plugin
name: ncmp-dmi-plugin
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
index d1fbdd3..1814a7b 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
- repository: '@local'
\ No newline at end of file
+ version: ~9.x-0
+ repository: '@local'
diff --git a/kubernetes/cps/requirements.yaml b/kubernetes/cps/requirements.yaml
index 0537233..bd9a80c 100644
--- a/kubernetes/cps/requirements.yaml
+++ b/kubernetes/cps/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2021 Bell Canada.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: cps-core
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: cps-core.enabled
- name: cps-temporal
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: cps-temporal.enabled
- name: ncmp-dmi-plugin
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- condition: ncmp-dmi-plugin.enabled
\ No newline at end of file
+ condition: ncmp-dmi-plugin.enabled
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 32f88ce..058d142 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2020 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE Microservices
name: dcaegen2-services
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
index ddf976e..6f9b3fd 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2020 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE Microservices Common templates
name: dcaegen2-services-common
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
index c903638..03f8b38 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
index a743d62..65944ff 100644
--- a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE BBS-EventProcessor Microservice
name: dcae-bbs-eventprocessor-ms
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml
index e267e89..b02251c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
index e7cde04..2c5ecf9 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE DataFile Collector Helm charts
name: dcae-datafile-collector
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml
index 540013e..a8c9898 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
index 70f68cf..24bb8e0 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,5 +20,4 @@
appVersion: "Honolulu"
description: DCAE datalake-admin-ui helm chart
name: dcae-datalake-admin-ui
-version: 8.0.0
-
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml
index 6412c80..af5b3bc 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
index 392db08..aa4c217 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE Datalake DES MS charts
name: dcae-datalake-des
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml
index e0ac99d..0faf380 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
index 1db95b8..1b70dcd 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Wipro Limited
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE Datalake feeder MS charts
name: dcae-datalake-feeder
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml
index fded2ce..a14fca9 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
index feb3d53..a350b93 100644
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE Heartbeat Microservice
name: dcae-heartbeat
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml
index ebfdcdb..dc8d47f 100644
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
index a5af26c..149b149 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE HV VES collector
name: dcae-hv-ves-collector
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
index 9a2dc1a..a087828 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
@@ -1,6 +1,7 @@
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Copyright (c) 2021 Nokia. All rights reserved.
# Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,20 +17,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
index 336ffc4..4fa84cb 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,5 +20,4 @@
appVersion: "Honolulu"
description: DCAE KPI MS chart
name: dcae-kpi-ms
-version: 8.0.0
-
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml
index 4239867..824c637 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
index 8a6ca89..dbd2012 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
@@ -3,6 +3,7 @@
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,4 +22,4 @@
appVersion: "Honolulu"
description: ONAP DCAE Microservice Health Check
name: dcae-ms-healthcheck
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
index 3762a2a..747117c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
index 1740464..5bd9b41 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE PM-Mapper Helm charts
name: dcae-pm-mapper
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml
index c39c209..404489c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../common/dcaegen2-services-common'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
index 0ebda2e..49ccae4 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (C) 2021 Nordix Foundation.
# Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,4 +21,4 @@
appVersion: "Honolulu"
description: DCAE PMSH Service
name: dcae-pmsh
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml
index 44c3664..68c9165 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
index 7030324..8620332 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE PRH
name: dcae-prh
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
index 37ffafe..8006092 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,17 +16,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
index f94f3cb..60445b1 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE RESTConf Collector
name: dcae-restconf-collector
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml
index e267e89..b02251c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
index 64b0d0f..b77f104 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,5 +20,4 @@
appVersion: "Honolulu"
description: DCAE SliceAnalysis MS charts
name: dcae-slice-analysis-ms
-version: 8.0.0
-
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml
index c6ccf13..ed0ce49 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
index 23020db..57beb71 100644
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE SNMPTrap Collector
name: dcae-snmptrap-collector
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml
index e267e89..b02251c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
index f57b63a..707d31d 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
@@ -1,6 +1,7 @@
# ============= LICENSE_START ================================================
# ============================================================================
# Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE Son-handler helm chart
name: dcae-son-handler
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml
index 907f8f3..99f0fb7 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml
@@ -1,6 +1,7 @@
# ============= LICENSE_START ================================================
# ============================================================================
# Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
index 99d3c3d..6b91fe3 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE TCA (Gen 2)
name: dcae-tcagen2
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
index b1d9fb2..48673fe 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2020 J. F. Lucas. All rights reserved.
# Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,20 +16,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
index 851896c..43e893b 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE VES Collector
name: dcae-ves-collector
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
index 9a2dc1a..a087828 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
@@ -1,6 +1,7 @@
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Copyright (c) 2021 Nokia. All rights reserved.
# Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,20 +17,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
index 2dc7467..92fdb21 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
appVersion: "Honolulu"
description: DCAE VES-Mapper Microservice
name: dcae-ves-mapper
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml
index e267e89..b02251c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START =============================
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/requirements.yaml b/kubernetes/dcaegen2-services/requirements.yaml
index 51368b6..b3432d3 100644
--- a/kubernetes/dcaegen2-services/requirements.yaml
+++ b/kubernetes/dcaegen2-services/requirements.yaml
@@ -1,6 +1,7 @@
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Copyright (c) 2021 AT&T. All rights reserved.
# Modifications Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,81 +17,81 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcae-bbs-eventprocessor-ms
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-bbs-eventprocessor-ms.enabled
- name: dcae-datafile-collector
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-datafile-collector.enabled
- name: dcae-datalake-admin-ui
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-datalake-admin-ui.enabled
- name: dcae-datalake-des
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-datalake-des.enabled
- name: dcae-datalake-feeder
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-datalake-feeder.enabled
- name: dcae-heartbeat
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-heartbeat.enabled
- name: dcae-hv-ves-collector
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-hv-ves-collector.enabled
- name: dcae-kpi-ms
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-kpi-ms.enabled
- name: dcae-ms-healthcheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-ms-healthcheck.enabled
- name: dcae-pm-mapper
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-pm-mapper.enabled
- name: dcae-pmsh
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-pmsh.enabled
- name: dcae-prh
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-prh.enabled
- name: dcae-restconf-collector
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-restconf-collector.enabled
- name: dcae-slice-analysis-ms
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-slice-analysis-ms.enabled
- name: dcae-snmptrap-collector
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-snmptrap-collector.enabled
- name: dcae-son-handler
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-son-handler.enabled
- name: dcae-tcagen2
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-tcagen2.enabled
- name: dcae-ves-collector
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-ves-collector.enabled
- name: dcae-ves-mapper
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcae-ves-mapper.enabled
diff --git a/kubernetes/dcaegen2-services/resources/external/map/schema-map.json b/kubernetes/dcaegen2-services/resources/external/map/schema-map.json
index 498521c..a70c597 100644
--- a/kubernetes/dcaegen2-services/resources/external/map/schema-map.json
+++ b/kubernetes/dcaegen2-services/resources/external/map/schema-map.json
@@ -1,18 +1,18 @@
[
{
- "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/faultMnS.yaml",
- "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/faultMnS.yaml"
+ "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml",
+ "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml"
},
{
- "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/FileDataReportingMnS.yaml",
- "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/FileDataReportingMnS.yaml"
+ "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml",
+ "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml"
},
{
- "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/heartbeatNtf.yaml",
- "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/heartbeatNtf.yaml"
+ "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml",
+ "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml"
},
{
- "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/provMnS.yaml",
- "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/provMnS.yaml"
+ "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml",
+ "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml"
}
]
\ No newline at end of file
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/5gcNrm.yaml
similarity index 78%
rename from kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml
rename to kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/5gcNrm.yaml
index 16a01b4..67512d7 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/5gcNrm.yaml
@@ -1,13 +1,13 @@
openapi: 3.0.1
info:
title: 3GPP 5GC NRM
- version: 16.6.0
+ version: 16.5.0
description: >-
OAS 3.0.1 specification of the 5GC NRM
© 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
All rights reserved.
externalDocs:
- description: 3GPP TS 28.541 V16.6.0; 5G NRM, 5GC NRM
+ description: 3GPP TS 28.541 V16.4.0; 5G NRM, 5GC NRM
url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
paths: {}
components:
@@ -223,7 +223,7 @@
commModelType:
$ref: '#/components/schemas/CommModelType'
targetNFServiceList:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ $ref: 'genericNrm.yaml#/components/schemas/DnList'
commModelConfiguration:
type: string
CommModelList:
@@ -240,7 +240,7 @@
fiveQIValues:
type: array
items:
- type: integer
+ type: integer
dscp:
type: integer
@@ -298,144 +298,6 @@
thresholdRtt:
type: integer
- QosData:
- type: object
- properties:
- qosId:
- type: string
- fiveQIValue:
- type: integer
- maxbrUl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
- maxbrDl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
- gbrUl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
- gbrDl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
- arp:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Arp'
- qosNotificationControl:
- type: boolean
- reflectiveQos:
- type: boolean
- sharingKeyDl:
- type: string
- sharingKeyUl:
- type: string
- maxPacketLossRateDl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm'
- maxPacketLossRateUl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm'
- extMaxDataBurstVol:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/ExtMaxDataBurstVolRm'
-
- QosDataList:
- type: array
- items:
- $ref: '#/components/schemas/QosData'
-
- SteeringMode:
- type: object
- properties:
- steerModeValue:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/SteerModeValue'
- active:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType'
- standby:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessTypeRm'
- threeGLoad:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Uinteger'
- prioAcc:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType'
-
- TrafficControlData:
- type: object
- properties:
- tcId:
- type: string
- flowStatus:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/FlowStatus'
- redirectInfo:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation'
- addRedirectInfo:
- type: array
- items:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation'
- minItems: 1
- muteNotif:
- type: boolean
- trafficSteeringPolIdDl:
- type: string
- nullable: true
- trafficSteeringPolIdUl:
- type: string
- nullable: true
- routeToLocs:
- type: array
- items:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/RouteToLocation'
- traffCorreInd:
- type: boolean
- upPathChgEvent:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/UpPathChgEvent'
- steerFun:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/SteeringFunctionality'
- steerModeDl:
- $ref: '#/components/schemas/SteeringMode'
- steerModeUl:
- $ref: '#/components/schemas/SteeringMode'
- mulAccCtrl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl'
-
- TrafficControlDataList:
- type: array
- items:
- $ref: '#/components/schemas/TrafficControlData'
-
- PccRule:
- type: object
- properties:
- pccRuleId:
- type: string
- description: Univocally identifies the PCC rule within a PDU session.
- flowInfoList:
- type: array
- items:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/FlowInformation'
- applicationId:
- type: string
- appDescriptor:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/ApplicationDescriptor'
- contentVersion:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/ContentVersion'
- precedence:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Uinteger'
- afSigProtocol:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/AfSigProtocol'
- isAppRelocatable:
- type: boolean
- isUeAddrPreserved:
- type: boolean
- qosData:
- type: array
- items:
- $ref: '#/components/schemas/QosDataList'
- altQosParams:
- type: array
- items:
- $ref: '#/components/schemas/QosDataList'
- trafficControlData:
- type: array
- items:
- $ref: '#/components/schemas/TrafficControlDataList'
- conditionData:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/ConditionData'
- tscaiInputDl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
- tscaiInputUl:
- $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
-
#-------- Definition of concrete IOCs --------------------------------------------
@@ -466,8 +328,6 @@
$ref: '#/components/schemas/AmfRegion-Multiple'
Configurable5QISet:
$ref: '#/components/schemas/Configurable5QISet-Multiple'
- Dynamic5QISet:
- $ref: '#/components/schemas/Dynamic5QISet-Multiple'
ManagedElement-Single:
allOf:
@@ -518,8 +378,6 @@
$ref: '#/components/schemas/NefFunction-Multiple'
Configurable5QISet:
$ref: '#/components/schemas/Configurable5QISet-Multiple'
- Dynamic5QISet:
- $ref: '#/components/schemas/Dynamic5QISet-Multiple'
AmfFunction-Single:
allOf:
@@ -542,7 +400,7 @@
snssaiList:
$ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
amfSet:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNrm.yaml#/components/schemas/Dn'
managedNFProfile:
$ref: '#/components/schemas/ManagedNFProfile'
commModelList:
@@ -632,10 +490,8 @@
$ref: '#/components/schemas/ManagedNFProfile'
commModelList:
$ref: '#/components/schemas/CommModelList'
- configurable5QISetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- dynamic5QISetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ Configurable5QISetRef:
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
@@ -658,8 +514,6 @@
$ref: '#/components/schemas/GtpUPathQoSMonitoringControl-Single'
QFQoSMonitoringControl:
$ref: '#/components/schemas/QFQoSMonitoringControl-Single'
- PredefinedPccRuleSet:
- $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
UpfFunction-Single:
allOf:
@@ -735,11 +589,6 @@
$ref: '#/components/schemas/ManagedNFProfile'
commModelList:
$ref: '#/components/schemas/CommModelList'
- configurable5QISetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- dynamic5QISetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
-
- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
@@ -753,9 +602,6 @@
$ref: '#/components/schemas/EP_N16-Multiple'
EP_Rx:
$ref: '#/components/schemas/EP_Rx-Multiple'
- PredefinedPccRuleSet:
- $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
-
AusfFunction-Single:
allOf:
- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1115,12 +961,12 @@
EP_N2-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1129,28 +975,26 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N3-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
$ref: 'nrNrm.yaml#/components/schemas/LocalAddress'
remoteAddress:
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
- epTransportRefs:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
EP_N4-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1159,12 +1003,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N5-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1173,12 +1017,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N6-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1187,12 +1031,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N7-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1201,12 +1045,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N8-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1215,12 +1059,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N9-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1229,12 +1073,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N10-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1243,12 +1087,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N11-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1257,12 +1101,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N12-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1271,12 +1115,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N13-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1285,12 +1129,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N14-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1299,12 +1143,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N15-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1313,12 +1157,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N16-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1327,12 +1171,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N17-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1342,12 +1186,12 @@
EP_N20-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1357,12 +1201,12 @@
EP_N21-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1371,12 +1215,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N22-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1386,12 +1230,12 @@
EP_N26-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1400,12 +1244,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N27-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1416,12 +1260,12 @@
EP_N31-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1430,12 +1274,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_N32-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
remotePlmnId:
@@ -1453,12 +1297,12 @@
EP_S5C-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1467,12 +1311,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_S5U-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1481,12 +1325,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_Rx-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1495,12 +1339,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_MAP_SMSC-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1509,12 +1353,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_NLS-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1523,12 +1367,12 @@
$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
EP_NLG-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1538,7 +1382,7 @@
FiveQiDscpMappingSet-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1552,7 +1396,7 @@
Configurable5QISet-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1563,24 +1407,9 @@
type: array
items:
$ref: '#/components/schemas/FiveQICharacteristics'
-
- Dynamic5QISet-Single:
- allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
- - type: object
- properties:
- attributes:
- allOf:
- - type: object
- properties:
- dynamic5QIs:
- type: array
- items:
- $ref: '#/components/schemas/FiveQICharacteristics'
-
GtpUPathQoSMonitoringControl-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1617,7 +1446,7 @@
QFQoSMonitoringControl-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1652,19 +1481,6 @@
qFMeasurementPeriod:
type: integer
- PredefinedPccRuleSet-Single:
- allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
- - type: object
- properties:
- attributes:
- allOf:
- - type: object
- properties:
- predefinedPccRules:
- type: array
- items:
- $ref: '#/components/schemas/PccRule'
#-------- Definition of JSON arrays for name-contained IOCs ----------------------
@@ -1899,82 +1715,75 @@
type: array
items:
$ref: '#/components/schemas/Configurable5QISet-Single'
- Dynamic5QISet-Multiple:
- type: array
- items:
- $ref: '#/components/schemas/Dynamic5QISet-Single'
-
#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
resources-5gcNrm:
oneOf:
- - $ref: '#/components/schemas/SubNetwork-Single'
- - $ref: '#/components/schemas/ManagedElement-Single'
- - $ref: '#/components/schemas/AmfFunction-Single'
- - $ref: '#/components/schemas/SmfFunction-Single'
- - $ref: '#/components/schemas/UpfFunction-Single'
- - $ref: '#/components/schemas/N3iwfFunction-Single'
- - $ref: '#/components/schemas/PcfFunction-Single'
- - $ref: '#/components/schemas/AusfFunction-Single'
- - $ref: '#/components/schemas/UdmFunction-Single'
- - $ref: '#/components/schemas/UdrFunction-Single'
- - $ref: '#/components/schemas/UdsfFunction-Single'
- - $ref: '#/components/schemas/NrfFunction-Single'
- - $ref: '#/components/schemas/NssfFunction-Single'
- - $ref: '#/components/schemas/SmsfFunction-Single'
- - $ref: '#/components/schemas/LmfFunction-Single'
- - $ref: '#/components/schemas/NgeirFunction-Single'
- - $ref: '#/components/schemas/SeppFunction-Single'
- - $ref: '#/components/schemas/NwdafFunction-Single'
- - $ref: '#/components/schemas/ScpFunction-Single'
- - $ref: '#/components/schemas/NefFunction-Single'
+ - $ref: '#/components/schemas/SubNetwork-Single'
+ - $ref: '#/components/schemas/ManagedElement-Single'
+ - $ref: '#/components/schemas/AmfFunction-Single'
+ - $ref: '#/components/schemas/SmfFunction-Single'
+ - $ref: '#/components/schemas/UpfFunction-Single'
+ - $ref: '#/components/schemas/N3iwfFunction-Single'
+ - $ref: '#/components/schemas/PcfFunction-Single'
+ - $ref: '#/components/schemas/AusfFunction-Single'
+ - $ref: '#/components/schemas/UdmFunction-Single'
+ - $ref: '#/components/schemas/UdrFunction-Single'
+ - $ref: '#/components/schemas/UdsfFunction-Single'
+ - $ref: '#/components/schemas/NrfFunction-Single'
+ - $ref: '#/components/schemas/NssfFunction-Single'
+ - $ref: '#/components/schemas/SmsfFunction-Single'
+ - $ref: '#/components/schemas/LmfFunction-Single'
+ - $ref: '#/components/schemas/NgeirFunction-Single'
+ - $ref: '#/components/schemas/SeppFunction-Single'
+ - $ref: '#/components/schemas/NwdafFunction-Single'
+ - $ref: '#/components/schemas/ScpFunction-Single'
+ - $ref: '#/components/schemas/NefFunction-Single'
- - $ref: '#/components/schemas/ExternalAmfFunction-Single'
- - $ref: '#/components/schemas/ExternalNrfFunction-Single'
- - $ref: '#/components/schemas/ExternalNssfFunction-Single'
- - $ref: '#/components/schemas/ExternalSeppFunction-Single'
+ - $ref: '#/components/schemas/ExternalAmfFunction-Single'
+ - $ref: '#/components/schemas/ExternalNrfFunction-Single'
+ - $ref: '#/components/schemas/ExternalNssfFunction-Single'
+ - $ref: '#/components/schemas/ExternalSeppFunction-Single'
- - $ref: '#/components/schemas/AmfSet-Single'
- - $ref: '#/components/schemas/AmfRegion-Single'
- - $ref: '#/components/schemas/QFQoSMonitoringControl-Single'
- - $ref: '#/components/schemas/GtpUPathQoSMonitoringControl-Single'
+ - $ref: '#/components/schemas/AmfSet-Single'
+ - $ref: '#/components/schemas/AmfRegion-Single'
+ - $ref: '#/components/schemas/QFQoSMonitoringControl-Single'
+ - $ref: '#/components/schemas/GtpUPathQoSMonitoringControl-Single'
- - $ref: '#/components/schemas/EP_N2-Single'
- - $ref: '#/components/schemas/EP_N3-Single'
- - $ref: '#/components/schemas/EP_N4-Single'
- - $ref: '#/components/schemas/EP_N5-Single'
- - $ref: '#/components/schemas/EP_N6-Single'
- - $ref: '#/components/schemas/EP_N7-Single'
- - $ref: '#/components/schemas/EP_N8-Single'
- - $ref: '#/components/schemas/EP_N9-Single'
- - $ref: '#/components/schemas/EP_N10-Single'
- - $ref: '#/components/schemas/EP_N11-Single'
- - $ref: '#/components/schemas/EP_N12-Single'
- - $ref: '#/components/schemas/EP_N13-Single'
- - $ref: '#/components/schemas/EP_N14-Single'
- - $ref: '#/components/schemas/EP_N15-Single'
- - $ref: '#/components/schemas/EP_N16-Single'
- - $ref: '#/components/schemas/EP_N17-Single'
+ - $ref: '#/components/schemas/EP_N2-Single'
+ - $ref: '#/components/schemas/EP_N3-Single'
+ - $ref: '#/components/schemas/EP_N4-Single'
+ - $ref: '#/components/schemas/EP_N5-Single'
+ - $ref: '#/components/schemas/EP_N6-Single'
+ - $ref: '#/components/schemas/EP_N7-Single'
+ - $ref: '#/components/schemas/EP_N8-Single'
+ - $ref: '#/components/schemas/EP_N9-Single'
+ - $ref: '#/components/schemas/EP_N10-Single'
+ - $ref: '#/components/schemas/EP_N11-Single'
+ - $ref: '#/components/schemas/EP_N12-Single'
+ - $ref: '#/components/schemas/EP_N13-Single'
+ - $ref: '#/components/schemas/EP_N14-Single'
+ - $ref: '#/components/schemas/EP_N15-Single'
+ - $ref: '#/components/schemas/EP_N16-Single'
+ - $ref: '#/components/schemas/EP_N17-Single'
- - $ref: '#/components/schemas/EP_N20-Single'
- - $ref: '#/components/schemas/EP_N21-Single'
- - $ref: '#/components/schemas/EP_N22-Single'
+ - $ref: '#/components/schemas/EP_N20-Single'
+ - $ref: '#/components/schemas/EP_N21-Single'
+ - $ref: '#/components/schemas/EP_N22-Single'
- - $ref: '#/components/schemas/EP_N26-Single'
- - $ref: '#/components/schemas/EP_N27-Single'
+ - $ref: '#/components/schemas/EP_N26-Single'
+ - $ref: '#/components/schemas/EP_N27-Single'
- - $ref: '#/components/schemas/EP_N31-Single'
- - $ref: '#/components/schemas/EP_N31-Single'
+ - $ref: '#/components/schemas/EP_N31-Single'
+ - $ref: '#/components/schemas/EP_N31-Single'
- - $ref: '#/components/schemas/EP_S5C-Single'
- - $ref: '#/components/schemas/EP_S5U-Single'
- - $ref: '#/components/schemas/EP_Rx-Single'
- - $ref: '#/components/schemas/EP_MAP_SMSC-Single'
- - $ref: '#/components/schemas/EP_NLS-Single'
- - $ref: '#/components/schemas/EP_NLG-Single'
- - $ref: '#/components/schemas/Configurable5QISet-Single'
- - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
- - $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
- - $ref: '#/components/schemas/Dynamic5QISet-Single'
+ - $ref: '#/components/schemas/EP_S5C-Single'
+ - $ref: '#/components/schemas/EP_S5U-Single'
+ - $ref: '#/components/schemas/EP_Rx-Single'
+ - $ref: '#/components/schemas/EP_MAP_SMSC-Single'
+ - $ref: '#/components/schemas/EP_NLS-Single'
+ - $ref: '#/components/schemas/EP_NLG-Single'
+ - $ref: '#/components/schemas/Configurable5QISet-Single'
+ - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerDataFileReportMnS.yaml
similarity index 88%
rename from kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml
rename to kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerDataFileReportMnS.yaml
index 01ff52f..dfacc14 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerDataFileReportMnS.yaml
@@ -1,47 +1,41 @@
openapi: 3.0.1
info:
- title: TS 28.532 File data reporting Service
- version: 16.6.0
+ title: TS 28.532 Performance data file reporting Service
+ version: 16.4.0
description: >-
- OAS 3.0.1 specification of the File data reporting Management Service © 2020,
+ OAS 3.0.1 specification of the Performance data file reporting Management Service © 2020,
3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All
rights reserved.
externalDocs:
- description: 3GPP TS 28.532 V16.5.0; Generic management services
+ description: 3GPP TS 28.532 V16.4.0; Generic management services
url: 'http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/'
servers:
- - url: '{MnSRoot}/FileDataReportingMnS/{MnSversion}'
+ - url: '{MnSRoot}/PerfDataFileReportMnS/v1640'
variables:
MnSRoot:
description: See subclause 4.4 of TS 32.158
default: http://example.com/3GPPManagement
- version:
- description: Indicates the current version of the specification
- default: 16.5.0
paths:
/Files:
get:
summary: Read resources of information of available files
- description: With HTTP GET, resources of information of available files are read. The resources to be read are identified with the path component (base resource) and the query component (fileaType, beginTime and endTime) of the URI. The fields query component allows to select the resource properties to be returned.
+ description: 'With HTTP GET, resources of information of available files are read. The resources to be read are identified with the path component (base resource) and the query component (managementDataType, beginTime and endTime) of the URI. The fields query component allows to select the resource properties to be returned.'
parameters:
- - name: fileType
+ - name: managementDataType
in: query
description: This parameter identifies the type of management data that the file contains to select the resources from the collection resources identified with the path component of the URI.
required: true
- schema:
- $ref: '#/components/schemas/fileType-Type'
+ $ref: '#/components/schemas/managementDataType-Type'
- name: beginTime
in: query
description: This parameter identifies the time stamp no later than which the file became available to select the resources from the collection resources identified with the path component of the URI.
required: true
- schema:
- $ref: '#/components/schemas/dateTime-Type'
+ $ref: '#/components/schemas/dateTime-Type'
- name: endTime
in: query
description: This parameter identifies the time stamp no earlier than which the file became available to select the resources from the collection resources identified with the path component of the URI.
required: true
- schema:
- $ref: '#/components/schemas/dateTime-Type'
+ $ref: '#/components/schemas/dateTime-Type'
responses:
'200':
description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
@@ -190,8 +184,6 @@
type: string
fileFormat:
type: string
- fileType:
- $ref: '#/components/schemas/fileType-Type'
error-ResponseType:
type: object
properties:
@@ -200,13 +192,10 @@
properties:
errorInfo:
type: string
- fileType-Type:
+ managementDataType-Type:
type: string
enum:
- - PERFORMANCE
- - TRACE
- - ANALYTICS
- - PROPRIETARY
+ - PM
header-Type:
description: Header used in notifications as notification header
type: object
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerMeasJobCtlMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerMeasJobCtlMnS.yaml
new file mode 100644
index 0000000..b6abe58
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerMeasJobCtlMnS.yaml
@@ -0,0 +1,280 @@
+openapi: 3.0.1
+info:
+ title: TS 28.550 Performance Measurement Job Control Service
+ version: 16.5.0
+ description: >-
+ OAS 3.0.1 specification of the Performance Measurement Job Control Service
+ @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+ All rights reserved.
+externalDocs:
+ description: 3GPP TS 28.550 V16.5.0; Performance assurance
+ url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.550/
+servers:
+ - url: 'http://{URI-DN-prefix}/{root}/PerfMeasJobCtrlMnS/v1650/{LDN-first-part}'
+ variables:
+ URI-DN-prefix:
+ description: See subclause 4.4 of TS 32.158
+ default: example.com
+ root:
+ description: See subclause 4.4 of TS 32.158
+ default: 3GPPManagement
+ LDN-first-part:
+ description: See subclause 4.4 of TS 32.158
+ default: ''
+paths:
+ /measJobs:
+ post:
+ summary: Create a measurement job
+ description: To create a measurement job the representation of the measurement job is POSTed on the /measJobs collection resource.
+ requestBody:
+ required: true
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/measJobCreation-RequestType'
+ responses:
+ '201':
+ description: Success case ("201 Created"). The representation of the newly created measurement job resource shall be returned.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/measJobCreation-ResponseType'
+ '202':
+ description: Partial success case ("202 Partically created"). The representation of the newly created measurement job resource with unsupported list shall be returned.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/measJobCreation-ResponseType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ get:
+ summary: Read resources of measurement jobs
+ description: 'With HTTP GET, resources of measurement jobs are read. The resources to be read are identified with the path component (base resource) and the query component (jobIdList) of the URI. The fields query component allows to select the resource properties to be returned.'
+ parameters:
+ - name: jobIdList
+ in: query
+ description: This parameter identifies the list of jobId to select the resources from the collection resources identified with the path component of the URI.
+ required: true
+ schema:
+ type: array
+ items:
+ type: string
+ responses:
+ '200':
+ description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/measJobsRetrieval-ResponseType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ '/measJobs/{jobId}':
+ get:
+ summary: Read resource of a single measurement job
+ description: 'With HTTP GET, resource of a measurement job is read. The resource to be read is identified with the path component of the URI.'
+ parameters:
+ - name: jobId
+ in: path
+ description: Identifies the measurement job to be read.
+ required: true
+ schema:
+ $ref: '#/components/schemas/uri-Type'
+ responses:
+ '200':
+ description: 'Success case ("200 OK"). The resource identified in the path for retrieval is returned in the response message body. '
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/measJobsRetrieval-ResponseType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ delete:
+ summary: Delete a single measurement job
+ description: The measurement job is deleted by deleting the corresponding measurement job resource. The resource to be deleted is identified with the path component of the URI.
+ parameters:
+ - name: jobId
+ in: path
+ description: Identifies the measurement job to be deleted.
+ required: true
+ schema:
+ $ref: '#/components/schemas/uri-Type'
+ responses:
+ '204':
+ description: Success case ("204 No Content"). The measurement job resource has been deleted. The response message body is absent.
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+components:
+ schemas:
+ dateTime-Type:
+ type: string
+ format: date-Time
+ uri-Type:
+ type: string
+ measJobCreation-RequestType:
+ type: object
+ properties:
+ iOCName:
+ type: string
+ iOCInstanceList:
+ type: array
+ items:
+ $ref: '#/components/schemas/uri-Type'
+ measurementCategoryList:
+ type: array
+ items:
+ type: string
+ reportingMethod:
+ $ref: '#/components/schemas/reportingMethod-Type'
+ granularityPeriod:
+ type: integer
+ reportingPeriod:
+ type: integer
+ startTime:
+ $ref: '#/components/schemas/dateTime-Type'
+ stopTime:
+ $ref: '#/components/schemas/dateTime-Type'
+ schedule:
+ $ref: '#/components/schemas/schedule-Type'
+ streamTarget:
+ type: string
+ priority:
+ $ref: '#/components/schemas/priority-Type'
+ reliability:
+ type: string
+ measJobCreation-ResponseType:
+ type: object
+ properties:
+ unsupportedList:
+ type: array
+ items:
+ $ref: '#/components/schemas/unsupportedMeas-Type'
+ measJobsRetrieval-ResponseType:
+ type: object
+ properties:
+ jobInfoList:
+ type: array
+ items:
+ $ref: '#/components/schemas/measJobInfo-ResourceType'
+ error-ResponseType:
+ type: object
+ properties:
+ error:
+ type: object
+ properties:
+ errorInfo:
+ type: string
+ measJobInfo-ResourceType:
+ type: object
+ properties:
+ href:
+ $ref: '#/components/schemas/uri-Type'
+ iOCName:
+ type: string
+ iOCInstanceList:
+ type: array
+ items:
+ $ref: '#/components/schemas/uri-Type'
+ measurementCategoryList:
+ type: array
+ items:
+ type: string
+ reportingMethod:
+ $ref: '#/components/schemas/reportingMethod-Type'
+ granularityPeriod:
+ type: integer
+ reportingPeriod:
+ type: integer
+ startTime:
+ $ref: '#/components/schemas/dateTime-Type'
+ stopTime:
+ $ref: '#/components/schemas/dateTime-Type'
+ schedule:
+ $ref: '#/components/schemas/schedule-Type'
+ streamTarget:
+ type: string
+ priority:
+ $ref: '#/components/schemas/priority-Type'
+ reliability:
+ type: string
+ schedule-Type:
+ type: object
+ properties:
+ scheduleOption:
+ $ref: '#/components/schemas/scheduleOption-Type'
+ dailySchedule:
+ type: array
+ items:
+ $ref: '#/components/schemas/timeInterval-Type'
+ weeklySchedule:
+ type: array
+ items:
+ $ref: '#/components/schemas/scheduleOfDay-Type'
+ timeInterval-Type:
+ type: object
+ properties:
+ intervalStart:
+ type: string
+ format: Time
+ intervalEnd:
+ type: string
+ format: Time
+ scheduleOfDay-Type:
+ type: object
+ properties:
+ dayOfWeek:
+ $ref: '#/components/schemas/dayOfWeek-Type'
+ intervalsOfDay:
+ type: array
+ items:
+ $ref: '#/components/schemas/timeInterval-Type'
+ unsupportedMeas-Type:
+ type: object
+ properties:
+ iOCInstance:
+ $ref: '#/components/schemas/uri-Type'
+ measurementTypeName:
+ type: string
+ reason:
+ type: string
+ reportingMethod-Type:
+ type: string
+ enum:
+ - file
+ - streaming
+ priority-Type:
+ type: string
+ enum:
+ - low
+ - medium
+ - high
+ scheduleOption-Type:
+ type: string
+ enum:
+ - daily
+ - weekly
+ dayOfWeek-Type:
+ type: string
+ enum:
+ - Monday
+ - Tuesday
+ - Wednesday
+ - Thursday
+ - Friday
+ - Saturday
+ - Sunday
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerThresMonMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerThresMonMnS.yaml
new file mode 100644
index 0000000..5bdb9c7
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerThresMonMnS.yaml
@@ -0,0 +1,102 @@
+openapi: 3.0.1
+info:
+ title: TS 28.532 Performance Threshold Monitoring Service
+ version: 16.4.0
+ description: OAS 3.0.1 specification of the Performance Threshold Monitoring Service
+servers:
+ - url: 'http://{monitoringNotifTarget}'
+ variables:
+ monitoringNotifTarget:
+ description: >-
+ The open API server of the performance threshold monitoring service is
+ located in the consumer side, see monitoringNotifTarget attribute of
+ the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11].
+ default: example.com
+paths:
+ /notificationSink:
+ post:
+ summary: Send notifications about performance threshold crossing
+ description: To send a notifyThresholdCrossing notification
+ requestBody:
+ required: true
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/notifyThresholdCrossing-NotifType'
+ responses:
+ '204':
+ description: >-
+ Success case ("204 No Content"). The notification is successfully
+ delivered. The response message body is absent.
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+components:
+ schemas:
+ dateTime-Type:
+ type: string
+ format: date-Time
+ uri-Type:
+ type: string
+ long-Type:
+ type: string
+ format: long
+ thresholdLevel-Type:
+ type: integer
+ measurementTypeName-Type:
+ type: string
+ measurementValue-Type:
+ type: string
+ additionalText-Type:
+ type: string
+ error-ResponseType:
+ type: object
+ properties:
+ error:
+ type: object
+ properties:
+ errorInfo:
+ type: string
+ header-Type:
+ description: Header used in notifications as notification header
+ type: object
+ properties:
+ uri:
+ $ref: '#/components/schemas/uri-Type'
+ notificationId:
+ $ref: '#/components/schemas/notificationId-Type'
+ notificationType:
+ $ref: '#/components/schemas/notificationType-Type'
+ eventTime:
+ $ref: '#/components/schemas/dateTime-Type'
+ notificationId-Type:
+ $ref: '#/components/schemas/long-Type'
+ notificationType-Type:
+ type: string
+ enum:
+ - notifyThresholdCrossing
+ notifyThresholdCrossing-NotifType:
+ type: object
+ properties:
+ header:
+ $ref: '#/components/schemas/header-Type'
+ body:
+ type: object
+ properties:
+ startOfMonitoringGP:
+ $ref: '#/components/schemas/dateTime-Type'
+ endOfMonitoringGP:
+ $ref: '#/components/schemas/dateTime-Type'
+ monitoredObjectInstance:
+ $ref: '#/components/schemas/uri-Type'
+ thresholdLevel:
+ $ref: '#/components/schemas/thresholdLevel-Type'
+ measurementTypeName:
+ $ref: '#/components/schemas/measurementTypeName-Type'
+ measurementValue:
+ $ref: '#/components/schemas/measurementValue-Type'
+ additionalText:
+ $ref: '#/components/schemas/additionalText-Type'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerfDataStreamingMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerfDataStreamingMnS.yaml
new file mode 100644
index 0000000..e040e14
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerfDataStreamingMnS.yaml
@@ -0,0 +1,363 @@
+openapi: 3.0.1
+info:
+ title: TS 28.550 Performance Data Streaming Service
+ version: 16.3.0
+ description: OAS 3.0.1 specification of the Performance Data Streaming Service
+servers:
+ - url: 'http://{streamTarget}/PerfDataStreamMnS/v1630'
+ description: This URL is used for posting the set of information about streams supported on the connection between the producer and the consumer.
+ variables:
+ streamTarget:
+ description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).'
+ default: example.com
+ - url: 'wss://{streamTarget}/PerfDataStreamMnS/v1630/streamingConnection'
+ description: This URL is used for establishing the WebSocket connection for the performance data streaming service.
+ variables:
+ streamTarget:
+ description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).'
+ default: example.com
+paths:
+ /streamInfoList:
+ post:
+ summary: The set of information about the streams sent from the producer to the consumer
+ description: To send the streamInfoList from the producer to the consumer
+ requestBody:
+ required: true
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/streamInfoListPost-RequestType'
+ responses:
+ '201':
+ description: Success case ("201 Posted"). The streamInfoList is successfully posted.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/streamInfoListPost-ResponseType'
+ '202':
+ description: Partial success case ("202 Partially posted"). The representation of the posted resource on stream information.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/streamInfoListPost-ResponseType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ get:
+ summary: Read resources of stream information from the streaming consumer
+ description: 'With HTTP GET, resources of stream information are read. The resources to be read are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be returned.'
+ parameters:
+ - name: streamIdList
+ in: query
+ description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI.
+ required: true
+ schema:
+ type: array
+ items:
+ type: integer
+ responses:
+ '200':
+ description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType'
+ '202':
+ description: Partial success case ("202 Partially retrieved"). The representation of the retrieved resources on stream information.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ patch:
+ summary: Update resources of stream information to the streaming consumer
+ description: 'With HTTP PATCH, resources of stream information are to be updated. The resources to be updated are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be updated.'
+ parameters:
+ - name: streamIdList
+ in: query
+ description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI.
+ required: true
+ schema:
+ type: array
+ items:
+ type: integer
+ requestBody:
+ required: true
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/listOfStreamInfoToUpdate-RequestType'
+ responses:
+ '200':
+ description: Success case ("200 OK"). The resources selected by the query parameter are updated and returned in the response message body.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType'
+ '202':
+ description: Partial success case ("202 Partially updated"). The representation of the updated resources on stream information
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ delete:
+ summary: The information of streams to be deleted by the producer to the consumer
+ description: 'With HTTP DELETE, resources of stream information are to be deleted. The resources to be deleted are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be deleted.'
+ parameters:
+ - name: streamIdList
+ in: query
+ description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI.
+ required: true
+ schema:
+ type: array
+ items:
+ type: integer
+ responses:
+ '204':
+ description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent.
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ '/streamInfoList/{streamId}':
+ get:
+ summary: Read resource of the stream information from the streaming consumer
+ description: 'With HTTP GET, resource of stream information is read. The resource to be read is identified with the path component the URI.'
+ parameters:
+ - name: streamId
+ in: path
+ description: Identifies the stream for which the information is to be retrieved.
+ required: true
+ schema:
+ $ref: '#/components/schemas/uri-Type'
+ responses:
+ '200':
+ description: Success case ("200 OK"). The resource identified in the request for retrieval is returned in the response message body.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ patch:
+ summary: Update the resource of stream information to the streaming consumer
+ description: 'With HTTP PATCH, resource of stream information is to be updated. The resource to be updated is identified by the path component of the URI. '
+ parameters:
+ - name: streamId
+ in: path
+ description: Identifies the stream for which the information is to be updated.
+ required: true
+ schema:
+ $ref: '#/components/schemas/uri-Type'
+ requestBody:
+ required: true
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/streamInfoToUpdate-RequestType'
+ responses:
+ '200':
+ description: Success case ("200 OK"). The resources identified by the path of the URI is updated and returned in the response message body.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/streamInfoUpdate-ResponseType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ delete:
+ summary: The stream information to be deleted by the producer to the consumer
+ description: 'With HTTP DELETE, resource of stream information identified by the path component of the URI is to be deleted.'
+ parameters:
+ - name: streamId
+ in: path
+ description: Identifies the stream for which the information is to be deleted
+ required: true
+ schema:
+ $ref: '#/components/schemas/uri-Type'
+ responses:
+ '204':
+ description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent.
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+ /streamConnection:
+ get:
+ summary: The connection for streaming from the producer to the consumer
+ description: To establish the WebSocket connection between the producer and the consumer. The HTTP version of this operation shall not be earlier than HTTP/1.1
+ parameters:
+ - in: header
+ name: Upgrade
+ required: true
+ schema:
+ $ref: '#/components/schemas/Upgrade-HeaderType'
+ - in: header
+ name: Connection
+ required: true
+ schema:
+ $ref: '#/components/schemas/Connection-HeaderType'
+ - in: header
+ name: Sec-WebSocket-Key
+ required: true
+ schema:
+ $ref: '#/components/schemas/Sec-WebSocket-Key-HeaderType'
+ - in: header
+ name: Sec-WebSocket-Version
+ required: true
+ schema:
+ $ref: '#/components/schemas/Sec-WebSocket-Version-HeaderType'
+ responses:
+ '101':
+ description: Success case ("101 Switching Protocols "). The connection has been successfully switched to WebSocket. The response message body is absent.
+ headers:
+ Upgrade:
+ schema:
+ $ref: '#/components/schemas/Upgrade-HeaderType'
+ Connection:
+ schema:
+ $ref: '#/components/schemas/Connection-HeaderType'
+ Sec-WebSocket-Accept-HeaderType:
+ schema:
+ $ref: '#/components/schemas/Sec-WebSocket-Accept-HeaderType'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/error-ResponseType'
+components:
+ schemas:
+ uri-Type:
+ type: string
+ streamInfoIn-Type:
+ type: object
+ properties:
+ streamId:
+ type: integer
+ iOCInstance:
+ $ref: '#/components/schemas/uri-Type'
+ measTypes:
+ type: array
+ items:
+ type: string
+ streamInfoOut-Type:
+ type: object
+ properties:
+ streamId:
+ $ref: '#/components/schemas/uri-Type'
+ iOCInstance:
+ $ref: '#/components/schemas/uri-Type'
+ measTypes:
+ type: array
+ items:
+ type: string
+ error-ResponseType:
+ type: object
+ properties:
+ error:
+ type: object
+ properties:
+ errorInfo:
+ type: string
+ streamInfoListPost-RequestType:
+ type: object
+ properties:
+ streamInfoList:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfoIn-Type'
+ streamInfoListPost-ResponseType:
+ type: object
+ properties:
+ streamInfoListPosted:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfoOut-Type'
+ streamInfoRetrieval-ResponseType:
+ type: object
+ properties:
+ streamInfoOut:
+ $ref: '#/components/schemas/streamInfoOut-Type'
+ listOfStreamInfoRetrieval-ResponseType:
+ type: object
+ properties:
+ listOfStreamInfoOut:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfoOut-Type'
+ streamInfoToUpdatePropertyType:
+ type: object
+ properties:
+ iOCInstance:
+ description: 'The updated measured object instance, empty value means no update.'
+ allOf:
+ - $ref: '#/components/schemas/uri-Type'
+ measTypes:
+ description: 'The updated list of measurement type, empty value means no update.'
+ type: array
+ items:
+ type: string
+ streamInfoToUpdate-RequestType:
+ type: object
+ properties:
+ streamInfoToUpdate:
+ $ref: '#/components/schemas/streamInfoToUpdatePropertyType'
+ listOfStreamInfoToUpdate-RequestType:
+ type: object
+ properties:
+ listOfStreamInfoToUpdate:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfoToUpdatePropertyType'
+ streamInfoUpdate-ResponseType:
+ type: object
+ properties:
+ streamInfoUpdated:
+ $ref: '#/components/schemas/streamInfoOut-Type'
+ listOfStreamInfoUpdate-ResponseType:
+ type: object
+ properties:
+ listOfStreamInfoUpdated:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfoOut-Type'
+ Upgrade-HeaderType:
+ type: string
+ enum:
+ - websocket
+ Connection-HeaderType:
+ type: string
+ enum:
+ - Upgrade
+ Sec-WebSocket-Key-HeaderType:
+ type: string
+ Sec-WebSocket-Version-HeaderType:
+ type: string
+ Sec-WebSocket-Accept-HeaderType:
+ type: string
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/comDefs.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/comDefs.yaml
new file mode 100644
index 0000000..04ab651
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/comDefs.yaml
@@ -0,0 +1,84 @@
+openapi: 3.0.1
+info:
+ title: Common Type Definitions
+ version: 16.3.0
+ description: >-
+ OAS 3.0.1 specification of common type definitions in the Generic NRM
+ © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+ All rights reserved.
+externalDocs:
+ description: 3GPP TS 28.623 V16.3.0; Generic NRM, Common Type Definitions
+ url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+ schemas:
+ Long:
+ type: string
+ format: long
+ Float:
+ type: string
+ format: float
+ DateTime:
+ type: string
+ format: date-Time
+ Dn:
+ type: string
+ Uri:
+ type: string
+ AttributeNameValuePairSet:
+ type: object
+ minProperties: 1
+ AttributeValueChangeSet:
+ description: >-
+ The key in this map is the attribute name. The value of each key is an array.
+ When only one item is present in the array, it carries the new attribute
+ value. If two items are present, then the first item carries the old value
+ and the second item the new value. The items can be of any type including null.
+ type: object
+ additionalProperties:
+ type: array
+ minItems: 1
+ maxItems: 2
+ items:
+ nullable: true
+ Filter:
+ type: string
+ SystemDN:
+ type: string
+ NotificationId:
+ type: integer
+ NotificationHeader:
+ description: >-
+ Header used for all notifications types
+ type: object
+ required:
+ - uri
+ - notificationId
+ - notificationType
+ - eventTime
+ - systemDn
+ properties:
+ uri:
+ $ref: '#/components/schemas/Uri'
+ notificationId:
+ $ref: '#/components/schemas/NotificationId'
+ notificationType:
+ oneOf:
+ - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes'
+ #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes'
+ # more to be added
+ eventTime:
+ $ref: '#/components/schemas/DateTime'
+ systemDN:
+ $ref: '#/components/schemas/SystemDN'
+ ErrorResponse:
+ description: >-
+ Default schema for the response message body in case the request
+ is not successful.
+ type: object
+ properties:
+ error:
+ type: object
+ properties:
+ errorInfo:
+ type: string
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/coslaNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/coslaNrm.yaml
new file mode 100644
index 0000000..48c85ec
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/coslaNrm.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.3
+
+info:
+ title: coslaNrm
+ version: 16.4.0
+ description:
+ OAS 3.0.1 specification of the Cosla NRM
+ © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+ All rights reserved.
+
+externalDocs:
+ description: 3GPP TS 28.536 V16.4.0; 5G NRM, Slice NRM
+ url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.536/
+
+paths: {}
+
+components:
+
+ schemas:
+
+#------------ Type definitions ---------------------------------------------------
+
+ ControlLoopLifeCyclePhase:
+ anyOf:
+ - type: string
+ enum:
+ - PREPARATION
+ - COMMISSIONING
+ - OPERATION
+ - DECOMMISSIONING
+ - type: string
+
+ TimeUnit:
+ anyOf:
+ - type: string
+ enum:
+ - SECOND
+ - MINUTE
+ - HOUR
+ - DAY
+ - type: string
+
+ OperationalState:
+ anyOf:
+ - type: string
+ enum:
+ - ENABLED
+ - DISABLED
+ - type: string
+
+ AdministrativeState:
+ anyOf:
+ - type: string
+ enum:
+ - LOCKED
+ - SHUTTING_DOWN
+ - UNLOCKED
+ - type: string
+
+ ObservationTime:
+ type: integer
+
+ ObservationTimePeriod:
+ type: object
+
+ AssuranceControlLoopGoal:
+ type: object
+
+ AssuranceGoalStatus:
+ type: object
+
+ AssuranceGoalStatusObserved:
+ type: object
+
+ AssuranceGoalStatusPredicted:
+ type: object
+
+#-------- Definition of concrete IOCs --------------------------------------------
+
+ AssuranceControlLoop-Single:
+ allOf:
+ - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
+ - type: object
+ properties:
+ operationalState:
+ $ref: '#/components/schemas/OperationalState'
+ administrativeState:
+ $ref: '#/components/schemas/AdministrativeState'
+ controlLoopLifeCyclePhase:
+ $ref: '#/components/schemas/ControlLoopLifeCyclePhase'
+ observationTimePeriod:
+ allOf:
+ - $ref: '#/components/schemas/ObservationTimePeriod'
+ - type: object
+ properties:
+ observationTime:
+ $ref: '#/components/schemas/ObservationTime'
+ timeUnit:
+ $ref: '#/components/schemas/TimeUnit'
+ AssuranceGoalStatus:
+ allOf:
+ - $ref: '#/components/schemas/AssuranceGoalStatus'
+ - type: object
+ properties:
+ assuranceGoalStatusObserved:
+ $ref: '#/components/schemas/AssuranceGoalStatusObserved'
+ assuranceGoalStatusPredicted:
+ $ref: '#/components/schemas/AssuranceGoalStatusPredicted'
+ managedEntity-Multiple:
+ $ref: '#/components/schemas/ManagedEntity-Multiple'
+ assuranceControlLoopGoal:
+ $ref: '#/components/schemas/AssuranceControlLoopGoal'
+
+ ManagedEntity-Single:
+ oneOf:
+ - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSlice'
+ - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSliceSubnet'
+ - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
+
+#-------- Definition of JSON arrays for name-contained IOCs ----------------------
+
+ AssuranceControlLoop-Multiple:
+ type: array
+ items:
+ $ref: '#/components/schemas/AssuranceControlLoop-Single'
+
+ ManagedEntity-Multiple:
+ type: array
+ items:
+ $ref: '#/components/schemas/ManagedEntity-Single'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml
similarity index 82%
rename from kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml
rename to kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml
index 752ead6..e882316 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml
@@ -1,21 +1,21 @@
openapi: 3.0.1
info:
title: Fault Supervision MnS
- version: 16.6.0
+ version: 16.4.0
description: >-
OAS 3.0.1 definition of the Fault Supervision MnS
© 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
All rights reserved.
externalDocs:
- description: 3GPP TS 28.532; Generic management services
+ description: 3GPP TS 28.532 V16.4.0; Generic management services
url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
servers:
- - url: '{MnSRoot}/FaultSupervisionMnS/{MnSversion}'
+ - url: '{MnSRoot}/FaultSupervisionMnS/{version}'
variables:
MnSRoot:
description: See subclause 4.4.3 of TS 32.158
default: http://example.com/3GPPManagement
- MnSversion:
+ version:
description: Version number of the OpenAPI definition
default: XXX
paths:
@@ -35,12 +35,12 @@
in: query
required: false
schema:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: '#/components/schemas/Dn'
- name: filter
in: query
required: false
schema:
- $ref: 'comDefs.yaml#/components/schemas/Filter'
+ $ref: '#/components/schemas/Filter'
responses:
'200':
description: >-
@@ -57,7 +57,7 @@
- type: object
properties:
lastNotificationHeader:
- $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ $ref: '#/components/schemas/NotificationHeader'
- $ref: '#/components/schemas/AlarmRecord'
- type: object
properties:
@@ -68,7 +68,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
patch:
summary: 'Clear, acknowledge or unacknowledge multiple alarms'
description: >-
@@ -130,7 +130,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
/alarms/{alarmId}:
patch:
summary: 'Clear, acknowledge or unacknowledge a single alarm'
@@ -163,7 +163,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
/alarms/{alarmId}/comments:
post:
summary: Add a comment to a single alarm
@@ -203,7 +203,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
/subscriptions:
post:
@@ -238,7 +238,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
callbacks:
notifyNewAlarm:
'{request.body#/consumerReference}':
@@ -262,7 +262,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
notifyClearedAlarm:
'{request.body#/consumerReference}':
post:
@@ -283,7 +283,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
notifyChangedAlarm:
'{request.body#/consumerReference}':
post:
@@ -304,7 +304,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
notifyChangedAlarmGeneral:
'{request.body#/consumerReference}':
post:
@@ -327,7 +327,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
notifyCorrelatedNotificationChanged:
'{request.body#/consumerReference}':
post:
@@ -348,7 +348,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
notifyAckStateChanged:
'{request.body#/consumerReference}':
post:
@@ -369,7 +369,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
notifyComments:
'{request.body#/consumerReference}':
post:
@@ -390,7 +390,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
notifyPotentialFaultyAlarmList:
'{request.body#/consumerReference}':
post:
@@ -411,7 +411,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
notifyAlarmListRebuilt:
'{request.body#/consumerReference}':
post:
@@ -432,7 +432,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
/subscriptions/{subscriptionId}:
delete:
summary: Delete a subscription
@@ -458,11 +458,92 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/ErrorResponse'
components:
schemas:
+ #---- Definitions to be moved to comDefs.yaml --------------------------------------#
+
+ Long:
+ type: string
+ format: long
+ Float:
+ type: string
+ format: float
+ DateTime:
+ type: string
+ format: date-Time
+
+ Dn:
+ type: string
+ Uri:
+ type: string
+
+ AttributeNameValuePairSet:
+ type: object
+ minProperties: 1
+ AttributeValueChangeSet:
+ description: >-
+ The key in this map is the attribute name. The value of each key is an array.
+ When only one item is present in the array, it carries the new attribute
+ value. If two items are present, then the first item carries the old value
+ and the second item the new value. The items can be of any type including null.
+ type: object
+ additionalProperties:
+ type: array
+ minItems: 1
+ maxItems: 2
+ items:
+ nullable: true
+
+ Filter:
+ type: string
+ SystemDN:
+ type: string
+
+ NotificationId:
+ type: integer
+ NotificationHeader:
+ description: >-
+ Header used for all notification types
+ type: object
+ required:
+ - href
+ - notificationId
+ - notificationType
+ - eventTime
+ - systemDN
+ properties:
+ uri:
+ $ref: '#/components/schemas/Uri'
+ notificationId:
+ $ref: '#/components/schemas/NotificationId'
+ notificationType:
+ oneOf:
+ - $ref: '#/components/schemas/AlarmNotificationTypes'
+ #- $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes'
+ #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes'
+ # more to be added
+ eventTime:
+ $ref: '#/components/schemas/DateTime'
+ systemDN:
+ $ref: '#/components/schemas/SystemDN'
+
+ ErrorResponse:
+ description: >-
+ Default schema for the response message body in case the request is not
+ successful.
+ type: object
+ properties:
+ error:
+ type: object
+ properties:
+ errorInfo:
+ type: string
+
+ #---- End of definitions to be moved to comDefs.yaml -------------------------------#
+
#---- Definition of AlarmRecord ----------------------------------------------------#
AlarmId:
@@ -527,47 +608,46 @@
high:
oneOf:
- type: integer
- - $ref: 'comDefs.yaml#/components/schemas/Float'
+ - $ref: '#/components/schemas/Float'
low:
- $ref: 'comDefs.yaml#/components/schemas/Float'
+ $ref: '#/components/schemas/Float'
ThresholdLevelInd:
- oneOf:
- - type: object
- properties:
- up:
- $ref: '#/components/schemas/ThresholdHysteresis'
- - type: object
- properties:
- down:
- $ref: '#/components/schemas/ThresholdHysteresis'
+ type: object
+ required:
+ - up
+ properties:
+ up:
+ $ref: '#/components/schemas/ThresholdHysteresis'
+ low:
+ $ref: '#/components/schemas/ThresholdHysteresis'
ThresholdInfo:
type: object
+ required:
+ - observedMeasurement
+ - observedValue
properties:
observedMeasurement:
type: string
observedValue:
oneOf:
- type: integer
- - $ref: 'comDefs.yaml#/components/schemas/Float'
- thresholdLevel:
+ - $ref: '#/components/schemas/Float'
+ thresholdLevelInd:
$ref: '#/components/schemas/ThresholdLevelInd'
armTime:
- $ref: 'comDefs.yaml#/components/schemas/DateTime'
- required:
- - observedMeasurement
- - observedValue
+ $ref: '#/components/schemas/DateTime'
CorrelatedNotification:
type: object
+ required:
+ - source
+ - notificationId
properties:
sourceObjectInstance:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: '#/components/schemas/Dn'
notificationIds:
type: array
items:
- $ref: 'comDefs.yaml#/components/schemas/NotificationId'
- required:
- - sourceObjectInstance
- - notificationIds
+ $ref: '#/components/schemas/NotificationId'
CorrelatedNotifications:
type: array
items:
@@ -587,15 +667,15 @@
# alarmId:
# $ref: '#/components/schemas/AlarmId'
objectInstance:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: '#/components/schemas/Dn'
notificationId:
- $ref: 'comDefs.yaml#/components/schemas/NotificationId'
+ $ref: '#/components/schemas/NotificationId'
alarmRaisedTime:
- $ref: 'comDefs.yaml#/components/schemas/DateTime'
+ $ref: '#/components/schemas/DateTime'
alarmChangedTime:
- $ref: 'comDefs.yaml#/components/schemas/DateTime'
+ $ref: '#/components/schemas/DateTime'
alarmClearedTime:
- $ref: 'comDefs.yaml#/components/schemas/DateTime'
+ $ref: '#/components/schemas/DateTime'
alarmType:
$ref: '#/components/schemas/AlarmType'
probableCause:
@@ -607,7 +687,7 @@
backedUpStatus:
type: boolean
backUpObject:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: '#/components/schemas/Dn'
trendIndication:
$ref: '#/components/schemas/TrendIndication'
thresholdinfo:
@@ -615,21 +695,21 @@
correlatedNotifications:
$ref: '#/components/schemas/CorrelatedNotifications'
stateChangeDefinition:
- $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+ $ref: '#/components/schemas/AttributeValueChangeSet'
monitoredAttributes:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
proposedRepairActions:
type: string
additionalText:
type: string
additionalInformation:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
rootCauseIndicator:
type: boolean
ackTime:
- $ref: 'comDefs.yaml#/components/schemas/DateTime'
+ $ref: '#/components/schemas/DateTime'
ackUserId:
type: string
ackSystemId:
@@ -670,7 +750,7 @@
NotifyNewAlarm:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
@@ -691,7 +771,7 @@
backedUpStatus:
type: boolean
backUpObject:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: '#/components/schemas/Dn'
trendIndication:
$ref: '#/components/schemas/TrendIndication'
thresholdInfo:
@@ -699,20 +779,20 @@
correlatedNotifications:
$ref: '#/components/schemas/CorrelatedNotifications'
stateChangeDefinition:
- $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+ $ref: '#/components/schemas/AttributeValueChangeSet'
monitoredAttributes:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
proposedRepairActions:
type: string
additionalText:
type: string
additionalInformation:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
rootCauseIndicator:
type: boolean
NotifyNewSecAlarm:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
@@ -736,7 +816,7 @@
additionalText:
type: string
additionalInformation:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
rootCauseIndicator:
type: boolean
serviceUser:
@@ -747,7 +827,7 @@
type: string
NotifyClearedAlarm:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
@@ -771,7 +851,7 @@
type: string
NotifyChangedAlarm:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
@@ -789,11 +869,14 @@
$ref: '#/components/schemas/PerceivedSeverity'
NotifyChangedAlarmGeneral:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
- alarmType
+ - probableCause
+ - perceivedSeverity
+ - changedAlarmAttributes
properties:
alarmId:
$ref: '#/components/schemas/AlarmId'
@@ -810,35 +893,38 @@
backedUpStatus:
type: boolean
backUpObject:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: '#/components/schemas/Dn'
trendIndication:
$ref: '#/components/schemas/TrendIndication'
thresholdInfo:
$ref: '#/components/schemas/ThresholdInfo'
stateChangeDefinition:
- $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+ $ref: '#/components/schemas/AttributeValueChangeSet'
monitoredAttributes:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
proposedRepairActions:
type: string
additionalText:
type: string
additionalInformation:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
rootCauseIndicator:
type: boolean
changedAlarmAttributes:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
NotifyChangedSecAlarmGeneral:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
- alarmType
+ - probableCause
+ - perceivedSeverity
- serviceUser
- serviceProvider
- securityAlarmDetector
+ - changedAlarmAttributes
properties:
alarmId:
$ref: '#/components/schemas/AlarmId'
@@ -853,7 +939,7 @@
additionalText:
type: string
additionalInformation:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
rootCauseIndicator:
type: boolean
serviceUser:
@@ -863,10 +949,10 @@
securityAlarmDetector:
type: string
changedAlarmAttributes:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+ $ref: '#/components/schemas/AttributeNameValuePairSet'
NotifyCorrelatedNotificationChanged:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
@@ -880,7 +966,7 @@
type: boolean
NotifyAckStateChanged:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
@@ -906,7 +992,7 @@
type: string
NotifyComments:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- alarmId
@@ -927,7 +1013,7 @@
$ref: '#/components/schemas/Comments'
NotifyPotentialFaultyAlarmList:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- reason
@@ -936,7 +1022,7 @@
type: string
NotifyAlarmListRebuilt:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/NotificationHeader'
- type: object
required:
- reason
@@ -1033,7 +1119,7 @@
type: object
properties:
commentTime:
- $ref: 'comDefs.yaml#/components/schemas/DateTime'
+ $ref: '#/components/schemas/DateTime'
commentUserId:
type: string
commentSystemId:
@@ -1051,8 +1137,8 @@
type: object
properties:
consumerReference:
- $ref: 'comDefs.yaml#/components/schemas/Uri'
+ $ref: '#/components/schemas/Uri'
timeTick:
- type: integer
+ $ref: '#/components/schemas/Long'
filter:
- $ref: 'comDefs.yaml#/components/schemas/Filter'
+ $ref: '#/components/schemas/Filter'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml
similarity index 82%
rename from kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml
rename to kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml
index 7e7576c..f826569 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml
@@ -1,13 +1,13 @@
openapi: 3.0.1
info:
title: Generic NRM
- version: 16.6.0
+ version: 16.4.0
description: >-
- OAS 3.0.1 definition of the Generic NRM
+ OAS 3.0.1 specification of the Generic NRM
© 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
All rights reserved.
externalDocs:
- description: 3GPP TS 28.623 V16.5.0; Generic NRM
+ description: 3GPP TS 28.623 V16.4.0; Generic NRM
url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
paths: {}
components:
@@ -15,11 +15,53 @@
#-------- Definition of types-----------------------------------------------------
+ DateTime:
+ type: string
+ format: date-time
+ Dn:
+ type: string
+ maxLength: 400
+ DnList:
+ type: array
+ items:
+ $ref: '#/components/schemas/Dn'
+ Mcc:
+ type: string
+ pattern: '^[0-9]{3}$'
+ Mnc:
+ type: string
+ pattern: '^[0-9]{2,3}$'
+ AdministrativeState:
+ type: string
+ enum:
+ - LOCKED
+ - UNLOCKED
+ OperationalState:
+ type: string
+ enum:
+ - ENABLED
+ - DISABLED
+ UsageState:
+ type: string
+ enum:
+ - IDEL
+ - ACTIVE
+ - BUSY
RegistrationState:
type: string
enum:
- REGISTERED
- DEREGISTERED
+ SetOfMcc:
+ type: array
+ items:
+ $ref: '#/components/schemas/Mcc'
+ ManagedElementType:
+ type: string
+ ManagedElementTypeList:
+ type: array
+ items:
+ $ref: '#/components/schemas/ManagedElementType'
VnfParameter:
type: object
properties:
@@ -31,6 +73,10 @@
type: string
autoScalable:
type: boolean
+ VnfParametersList:
+ type: array
+ items:
+ $ref: '#/components/schemas/VnfParameter'
SiteLatitude:
type: number
format: float
@@ -58,26 +104,44 @@
type: string
powerInterface:
type: string
+ PeeParametersList:
+ type: array
+ items:
+ $ref: '#/components/schemas/PeeParameter'
+ MonitoringGPList:
+ type: array
+ items:
+ type: integer
+ ThresholdInfoList:
+ type: array
+ items:
+ $ref: '#/components/schemas/ThresholdInfo'
ThresholdInfo:
type: object
properties:
- thresholdDirection:
+ measurementType:
type: string
- enum:
- - UP
- - DOWN
- - UP_AND_DOWN
+ direction:
+ $ref: '#/components/schemas/Direction'
+ thresholdPack:
+ $ref: '#/components/schemas/ThresholdPack'
+ Direction:
+ enum:
+ - Increasing
+ - Decreasing
+ ThresholdPack:
+ type: array
+ items:
+ $ref: '#/components/schemas/ThresholdPackElement'
+ ThresholdPackElement:
+ type: object
+ properties:
+ thresholdLevel:
+ type: integer
thresholdValue:
- oneOf:
- - type: integer
- - $ref: 'comDefs.yaml#/components/schemas/Float'
+ type: number
hysteresis:
- oneOf:
- - type: integer
- minimum: 0
- - type: number
- format: float
- minimum: 0
+ type: number
Operation:
type: object
properties:
@@ -87,6 +151,10 @@
$ref: '#/components/schemas/NFType'
operationSemantics:
$ref: '#/components/schemas/OperationSemantics'
+ OperationList:
+ type: array
+ items:
+ $ref: '#/components/schemas/Operation'
NFType:
type: string
description: ' NF name defined in TS 23.501'
@@ -143,18 +211,32 @@
type: string
pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
example: '198.51.100.1'
+ Ipv4AddrRm:
+ type: string
+ pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
+ example: '198.51.100.1'
+ nullable: true
Ipv6Addr:
type: string
allOf:
- pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'
- pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'
example: '2001:db8:85a3::8a2e:370:7334'
+ Ipv6AddrRm:
+ type: string
+ allOf:
+ - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'
+ - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'
+ example: '2001:db8:85a3::8a2e:370:7334'
+ nullable: true
Ipv6Prefix:
type: string
allOf:
- pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$'
- pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$'
example: '2001:db8:abcd:12::0/64'
+ Uri:
+ type: string
TransportProtocol:
anyOf:
- type: string
@@ -178,14 +260,9 @@
items:
type: string
enum:
- - FILE_BASED_LOC_SET_BY_PRODUCER
- - FILE_BASED_LOC_SET_BY_CONSUMER
- - STREAM_BASED
- monitorGranularityPeriods:
- type: array
- items:
- type: integer
- minimum: 1
+ - FILE_BASED_LOC_SET_BY_PRODUCER
+ - FILE_BASED_LOC_SET_BY_CONSUMER
+ - STREAM_BASED
ReportingCtrl:
oneOf:
- type: object
@@ -197,11 +274,11 @@
fileReportingPeriod:
type: integer
fileLocation:
- $ref: 'comDefs.yaml#/components/schemas/Uri'
+ $ref: '#/components/schemas/Uri'
- type: object
properties:
streamTarget:
- $ref: 'comDefs.yaml#/components/schemas/Uri'
+ $ref: '#/components/schemas/Uri'
Scope:
type: object
properties:
@@ -214,6 +291,28 @@
- BASE_SUBTREE
scopeLevel:
type: integer
+ NotificationType:
+ type: string
+ enum:
+ - notifyMOICreation
+ - notifyMOIDeletion
+ - notifyMOIAttributeValueChanges
+ - notifyEvent
+ - notifyNewAlarm
+ - notifyChangedAlarm
+ - notifyAckStateChanged
+ - notifyComments
+ - notifyCorrelatedNotificationChanged
+ - notifyChangedAlarmGeneral
+ - notifyAlarmListRebuilt
+ - notifyPotentialFaultyAlarmList
+ - notifyFileReady
+ - notifyFilePreparationError
+ - notifyThresholdCrossing
+ NotificationTypes:
+ type: array
+ items:
+ $ref: '#/components/schemas/NotificationType'
#-------- Definition of types used in Trace control NRM fragment------------------
@@ -583,9 +682,9 @@
description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details.
properties:
mcc:
- $ref: 'comDefs.yaml#/components/schemas/Mcc'
+ $ref: '#/components/schemas/Mcc'
mnc:
- $ref: 'comDefs.yaml#/components/schemas/Mnc'
+ $ref: '#/components/schemas/Mnc'
required:
- mcc
- mnc
@@ -617,9 +716,9 @@
description: The Trace Reference parameter shall be globally unique, therefore the Trace Reference shall compose as follows - MCC+MNC+Trace ID, where the MCC and MNC are coming with the Trace activation request from the management system to identify one PLMN containing the management system, and Trace ID is a 3 byte Octet String. See 3GPP TS 32.422 clause 5.6 for additional details.
properties:
mcc:
- $ref: 'comDefs.yaml#/components/schemas/Mcc'
+ $ref: '#/components/schemas/Mcc'
mnc:
- $ref: 'comDefs.yaml#/components/schemas/Mnc'
+ $ref: '#/components/schemas/Mnc'
traceId:
type: integer
required:
@@ -635,28 +734,19 @@
- STREAMING
tjTraceTarget-Type:
- type: object
- description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422
- properties:
- TargetIdType:
- type: string
- enum:
- - IMSI
- - IMEI
- - IMEISV
- - PUBLIC_ID
- - UTRAN_CELL
- - E-UTRAN_CELL
- - NG-RAN_CELL
- - eNB
- - RNC
- - gNB
- - SUPI
- TargetIdValue:
- type: string
- required:
- - TargetIdType
- - TargetIdValue
+ type: string
+ description: Type of trace target. For additional details see 3GPP TS 32.422.
+ enum:
+ - IMSI
+ - IMEI
+ - IMEISV
+ - PUBLIC_ID
+ - UTRAN_CELL
+ - E-UTRAN_CELL
+ - NG-RAN_CELL
+ - eNB
+ - RNC
+ - gNB
tjTriggeringEvent-Type:
type: object
@@ -704,7 +794,7 @@
tjMDTAreaScope-Type:
description: defines the area in terms or Cells or Tracking Area/Routing Area/Location Area where the MDT data collection shall take place. For additional details see 3GPP TS 32.422 clause 5.10.2.
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/DnList'
+ - $ref: '#/components/schemas/DnList'
tjMDTCollectionPeriodRrmLte-Type:
description: See details in 3GPP TS 32.422 clause 5.10.20.
@@ -738,17 +828,6 @@
- 10240ms
- 1min
- tjMDTCollectionPeriodRrmNR-Type:
- description: See details in 3GPP TS 32.422 clause 5.10.30.
- type: string
- enum:
- - 1024ms
- - 1280ms
- - 2048ms
- - 5120ms
- - 10240ms
- - 60000ms
-
tjMDTEventListForTriggeredMeasurement-Type:
description: See details in 3GPP TS 32.422 clause 5.10.28.
type: string
@@ -923,9 +1002,9 @@
type: object
properties:
mcc:
- $ref: 'comDefs.yaml#/components/schemas/Mcc'
+ $ref: '#/components/schemas/Mcc'
mnc:
- $ref: 'comDefs.yaml#/components/schemas/Mnc'
+ $ref: '#/components/schemas/Mnc'
required:
- mcc
- mnc
@@ -1025,9 +1104,9 @@
type: object
properties:
mcc:
- $ref: 'comDefs.yaml#/components/schemas/Mcc'
+ $ref: '#/components/schemas/Mcc'
mnc:
- $ref: 'comDefs.yaml#/components/schemas/Mnc'
+ $ref: '#/components/schemas/Mnc'
required:
- mcc
- mnc
@@ -1075,9 +1154,7 @@
userDefinedNetworkType:
type: string
setOfMcc:
- type: array
- items:
- $ref: 'comDefs.yaml#/components/schemas/Mcc'
+ $ref: '#/components/schemas/SetOfMcc'
priorityLabel:
type: integer
supportedPerfMetricGroups:
@@ -1090,15 +1167,13 @@
dnPrefix:
type: string
managedElementTypeList:
- type: array
- items:
- type: string
+ $ref: '#/components/schemas/ManagedElementTypeList'
userLabel:
type: string
locationName:
type: string
managedBy:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ $ref: '#/components/schemas/DnList'
vendorName:
type: string
userDefinedState:
@@ -1123,6 +1198,8 @@
$ref: '#/components/schemas/PerfMetricJob-Multiple'
ThresholdMonitor:
$ref: '#/components/schemas/ThresholdMonitor-Multiple'
+ ThresholdMonitoringCapability:
+ $ref: '#/components/schemas/ThresholdMonitoringCapability-Single'
NtfSubscriptionControl:
$ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
TraceJob:
@@ -1136,6 +1213,8 @@
$ref: '#/components/schemas/PerfMetricJob-Multiple'
ThresholdMonitor:
$ref: '#/components/schemas/ThresholdMonitor-Multiple'
+ ThresholdMonitoringCapability:
+ $ref: '#/components/schemas/ThresholdMonitoringCapability-Single'
NtfSubscriptionControl:
$ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
TraceJob:
@@ -1151,13 +1230,9 @@
userLabel:
type: string
vnfParametersList:
- type: array
- items:
- $ref: '#/components/schemas/VnfParameter'
+ $ref: '#/components/schemas/VnfParametersList'
peeParametersList:
- type: array
- items:
- $ref: '#/components/schemas/PeeParameter'
+ $ref: '#/components/schemas/PeeParametersList'
priorityLabel:
type: integer
supportedPerfMetricGroups:
@@ -1212,8 +1287,6 @@
$ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type'
tjMDTCollectionPeriodRrmUmts:
$ref: '#/components/schemas/tjMDTCollectionPeriodRrmUmts-Type'
- tjMDTCollectionPeriodRrmNR:
- $ref: '#/components/schemas/tjMDTCollectionPeriodRrmNR-Type'
tjMDTEventListForTriggeredMeasurement:
$ref: '#/components/schemas/tjMDTEventListForTriggeredMeasurement-Type'
tjMDTEventThreshold:
@@ -1258,10 +1331,12 @@
ManagedFunction-ncO:
type: object
properties:
- PerfMetricJob:
- $ref: '#/components/schemas/PerfMetricJob-Multiple'
+ MeasurementControl:
+ $ref: '#/components/schemas/MeasurementControl-Multiple'
ThresholdMonitor:
$ref: '#/components/schemas/ThresholdMonitor-Multiple'
+ ThresholdMonitoringCapability:
+ $ref: '#/components/schemas/ThresholdMonitoringCapability-Single'
ManagedNFService:
$ref: '#/components/schemas/ManagedNFService-Multiple'
TraceJob:
@@ -1287,7 +1362,7 @@
$ref: '#/components/schemas/VsDataContainer-Multiple'
ManagedNFService-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1300,20 +1375,18 @@
sAP:
$ref: '#/components/schemas/SAP'
operations:
- type: array
- items:
- $ref: '#/components/schemas/Operation'
+ $ref: '#/components/schemas/OperationList'
administrativeState:
- $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+ $ref: '#/components/schemas/AdministrativeState'
operationalState:
- $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+ $ref: '#/components/schemas/OperationalState'
usageState:
- $ref: 'comDefs.yaml#/components/schemas/UsageState'
+ $ref: '#/components/schemas/UsageState'
registrationState:
$ref: '#/components/schemas/RegistrationState'
ManagementNode-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1322,7 +1395,7 @@
userLabel:
type: string
managedElements:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ $ref: '#/components/schemas/DnList'
vendorName:
type: string
userDefinedState:
@@ -1333,7 +1406,7 @@
type: string
MeContext-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1343,17 +1416,17 @@
type: string
PerfMetricJob-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
type: object
properties:
administrativeState:
- $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+ $ref: '#/components/schemas/AdministrativeState'
operationalState:
- $ref: 'comDefs.yaml#/components/schemas/OperationalState'
- jobId:
+ $ref: '#/components/schemas/OperationalState'
+ perfMetricJobGroupId:
type: string
performanceMetrics:
type: array
@@ -1363,52 +1436,51 @@
type: integer
minimum: 1
objectInstances:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ $ref: '#/components/schemas/DnList'
rootObjectInstances:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ $ref: '#/components/schemas/DnList'
reportingCtrl:
$ref: '#/components/schemas/ReportingCtrl'
- ThresholdMonitor-Single:
+ ThresholdMonitoringCapability-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
type: object
properties:
- administrativeState:
- $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
- operationalState:
- $ref: 'comDefs.yaml#/components/schemas/OperationalState'
- performanceMetrics:
- type: array
- items:
- type: string
+ supportedMonitoringGPs:
+ $ref: '#/components/schemas/MonitoringGPList'
+ ThresholdMonitor-Single:
+ allOf:
+ - $ref: '#/components/schemas/Top-Attr'
+ - type: object
+ properties:
+ attributes:
+ type: object
+ properties:
thresholdInfoList:
- type: array
- items:
- $ref: '#/components/schemas/ThresholdInfo'
- monitorGranularityPeriod:
+ $ref: '#/components/schemas/ThresholdInfoList'
+ monitoringGP:
type: integer
- minimum: 1
- objectInstances:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
- rootObjectInstances:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ monitoringNotifTarget:
+ type: string
+ monitoredIOCName:
+ type: string
+ monitoredObjectDNs:
+ $ref: '#/components/schemas/DnList'
NtfSubscriptionControl-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
type: object
properties:
notificationRecipientAddress:
- $ref: 'comDefs.yaml#/components/schemas/Uri'
+ $ref: '#/components/schemas/Uri'
notificationTypes:
- type: array
- items:
- $ref: 'comDefs.yaml#/components/schemas/NotificationType'
+ $ref: '#/components/schemas/NotificationTypes'
scope:
$ref: '#/components/schemas/Scope'
notificationFilter:
@@ -1417,7 +1489,7 @@
$ref: '#/components/schemas/HeartbeatControl-Single'
HeartbeatControl-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1429,7 +1501,7 @@
type: boolean
TraceJob-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1437,29 +1509,29 @@
AlarmList-Single:
allOf:
- - $ref: '#/components/schemas/Top'
+ - $ref: '#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
type: object
properties:
administrativeState:
- $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+ $ref: '#/components/schemas/AdministrativeState'
operationalState:
- $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+ $ref: '#/components/schemas/OperationalState'
numOfAlarmRecords:
type: integer
lastModification:
- $ref: 'comDefs.yaml#/components/schemas/DateTime'
+ $ref: '#/components/schemas/DateTime'
alarmRecords:
description: >-
- This resource represents a map of alarm records.
- The alarmIds are used as keys in the map.
+ This resource represents a map of alarm records.
+ The alarmIds are used as keys in the map.
type: object
additionalProperties:
$ref: 'faultMnS.yaml#/components/schemas/AlarmRecord'
-#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+#-------- Definition of JSON arrays for name-contained IOCs ----------------------
VsDataContainer-Multiple:
type: array
@@ -1480,37 +1552,39 @@
PerfMetricJob-Multiple:
type: array
items:
- $ref: '#/components/schemas/PerfMetricJob-Single'
+ $ref: '#/components/schemas/MetricProdJob-Single'
ThresholdMonitor-Multiple:
type: array
items:
$ref: '#/components/schemas/ThresholdMonitor-Single'
- TraceJob-Multiple:
- type: array
- items:
- $ref: '#/components/schemas/TraceJob-Single'
NtfSubscriptionControl-Multiple:
type: array
items:
$ref: '#/components/schemas/NtfSubscriptionControl-Single'
+ TraceJob-Multiple:
+ type: array
+ items:
+ $ref: '#/components/schemas/TraceJob-Single'
#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
resources-genericNrm:
oneOf:
- - $ref: '#/components/schemas/VsDataContainer-Single'
+ - $ref: '#/components/schemas/VsDataContainer-Single'
- - $ref: '#/components/schemas/ManagementNode-Single'
- - $ref: '#/components/schemas/MeContext-Single'
+ - $ref: '#/components/schemas/ManagementNode-Single'
+ - $ref: '#/components/schemas/MeContext-Single'
- - $ref: '#/components/schemas/ManagedNFService-Single'
+ - $ref: '#/components/schemas/ManagedNFService-Single'
- - $ref: '#/components/schemas/PerfMetricJob-Single'
- - $ref: '#/components/schemas/ThresholdMonitor-Single'
- - $ref: '#/components/schemas/TraceJob-Single'
+ - $ref: '#/components/schemas/PerfMetricJob-Single'
- - $ref: '#/components/schemas/NtfSubscriptionControl-Single'
- - $ref: '#/components/schemas/HeartbeatControl-Single'
+ - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single'
+ - $ref: '#/components/schemas/ThresholdMonitor-Single'
- - $ref: '#/components/schemas/AlarmList-Single'
+ - $ref: '#/components/schemas/NtfSubscriptionControl-Single'
+ - $ref: '#/components/schemas/HeartbeatControl-Single'
+ - $ref: '#/components/schemas/TraceJob-Single'
+
+ - $ref: '#/components/schemas/AlarmList-Single'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/heartbeatNtf.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/heartbeatNtf.yaml
new file mode 100644
index 0000000..afde506
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/heartbeatNtf.yaml
@@ -0,0 +1,23 @@
+openapi: 3.0.1
+info:
+ title: Heartbeat notification
+ version: 16.3.0
+ description: >-
+ OAS 3.0.1 specification of the heartbeat notification
+ © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+ All rights reserved.
+externalDocs:
+ description: 3GPP TS 28.532 V16.3.0; Heartbeat notification
+ url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.6532/
+paths: {}
+components:
+ schemas:
+ hearbeatNtfPeriod-Type:
+ type: integer
+ notifyHeartbeat-NotifType:
+ allOf:
+ - $ref: 'provMnS.yaml#/components/schemas/header-Type'
+ - type: object
+ properties:
+ heartbeatNtfPeriod:
+ $ref: '#/components/schemas/hearbeatNtfPeriod-Type'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml
similarity index 80%
rename from kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml
rename to kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml
index 3ff7a21..85a8ac1 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml
@@ -1,13 +1,13 @@
openapi: 3.0.1
info:
title: NR NRM
- version: 16.6.0
+ version: 16.5.0
description: >-
OAS 3.0.1 specification of the NR NRM
© 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
All rights reserved.
externalDocs:
- description: 3GPP TS 28.541 V16.6.0; 5G NRM, NR NRM
+ description: 3GPP TS 28.541 V16.5.0; 5G NRM, NR NRM
url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
paths: {}
components:
@@ -55,7 +55,7 @@
type: object
properties:
mcc:
- $ref: 'comDefs.yaml#/components/schemas/Mcc'
+ $ref: 'genericNrm.yaml#/components/schemas/Mcc'
mnc:
$ref: '#/components/schemas/Mnc'
PlmnIdList:
@@ -73,22 +73,16 @@
type: array
items:
$ref: '#/components/schemas/PlmnInfo'
- GGnbId:
- type: string
- pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}'
- GEnbId:
- type: string
- pattern: '^[0-9]{3}[0-9]{2,3}-(18|20|21|22)-[0-9]{1,7}'
GGnbIdList:
type: array
- items:
- $ref: '#/components/schemas/GGnbId'
+ items: string
+ pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}'
GEnbIdList:
type: array
- items:
- $ref: '#/components/schemas/GEnbId'
+ items: string
+ pattern: '^[0-9]{3}[0-9]{2,3}-(18|20|21|22)-[0-9]{1,7}'
NrPci:
type: integer
@@ -172,7 +166,7 @@
timeDuration:
type: integer
- UeAccProbilityDist:
+ UeAccProbilityDistPerSSB:
type: object
properties:
targetProbability:
@@ -180,7 +174,7 @@
numberofpreamblessent:
type: integer
- UeAccDelayProbilityDist:
+ UeAccDelayProbilityDistPerSSB:
type: object
properties:
targetProbability:
@@ -268,7 +262,8 @@
type: array
items:
$ref: '#/components/schemas/RrmPolicyMember'
- AddressWithVlan:
+
+ LocalAddress:
type: object
properties:
ipv4Address:
@@ -279,11 +274,6 @@
type: integer
minimum: 0
maximum: 4096
- LocalAddress:
- type: object
- properties:
- addressWithVlan:
- $ref: '#/components/schemas/AddressWithVlan'
port:
type: integer
minimum: 0
@@ -421,11 +411,11 @@
rimRSSubcarrierSpacing:
type: integer
rIMRSBandwidth:
- type: integer
+ type: integer
nrofGlobalRIMRSFrequencyCandidates:
type: integer
rimRSCommonCarrierReferencePoint:
- type: integer
+ type: integer
rimRSStartingFrequencyOffsetIdList:
type: array
items:
@@ -435,13 +425,13 @@
type: object
properties:
nrofRIMRSSequenceCandidatesofRS1:
- type: integer
+ type: integer
rimRSScrambleIdListofRS1:
type: array
items:
type: integer
nrofRIMRSSequenceCandidatesofRS2:
- type: integer
+ type: integer
rimRSScrambleIdListofRS2:
type: array
items:
@@ -462,33 +452,33 @@
dlULSwitchingPeriod1:
type: string
enum:
- - MS0P5
- - MS0P625
- - MS1
- - MS1P25
- - MS2
- - MS2P5
- - MS3
- - MS4
- - MS5
- - MS10
- - MS20
+ - MS0P5
+ - MS0P625
+ - MS1
+ - MS1P25
+ - MS2
+ - MS2P5
+ - MS3
+ - MS4
+ - MS5
+ - MS10
+ - MS20
symbolOffsetOfReferencePoint1:
- type: integer
+ type: integer
dlULSwitchingPeriod2:
type: string
enum:
- - MS0P5
- - MS0P625
- - MS1
- - MS1P25
- - MS2
- - MS2P5
- - MS3
- - MS4
- - MS5
- - MS10
- - MS20
+ - MS0P5
+ - MS0P625
+ - MS1
+ - MS1P25
+ - MS2
+ - MS2P5
+ - MS3
+ - MS4
+ - MS5
+ - MS10
+ - MS20
symbolOffsetOfReferencePoint2:
type: integer
totalnrofSetIdofRS1:
@@ -542,7 +532,7 @@
- ENABLE
- DISABLE
reportInterval:
- type: integer
+ type: integer
nrofRIMRSReportInfo:
type: integer
maxPropagationDelay:
@@ -551,22 +541,6 @@
type: array
items:
$ref: '#/components/schemas/RimRSReportInfo'
- TceMappingInfo:
- type: object
- properties:
- TceIPAddress:
- oneOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'
- - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'
- TceID:
- type: integer
- PlmnTarget:
- $ref: '#/components/schemas/PlmnId'
- TceMappingInfoList:
- type: array
- items:
- $ref: '#/components/schemas/TceMappingInfo'
-
#-------- Definition of abstract IOCs --------------------------------------------
@@ -619,17 +593,14 @@
$ref: '5gcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
RimRSGlobal:
$ref: '#/components/schemas/RimRSGlobal-Single'
- Dynamic5QISet:
- $ref: '5gcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
-
ManagedElement-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
- $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/ManagedElement-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedElement-ncO'
- type: object
properties:
GnbDuFunction:
@@ -652,17 +623,15 @@
$ref: '#/components/schemas/CESManagementFunction-Single'
Configurable5QISet:
$ref: '5gcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
- Dynamic5QISet:
- $ref: '5gcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
GnbDuFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
gnbDuId:
@@ -675,7 +644,7 @@
$ref: '#/components/schemas/GnbIdLength'
rimRSReportConf:
$ref: '#/components/schemas/RimRSReportConf'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
RRMPolicyRatio:
@@ -690,16 +659,14 @@
$ref: '#/components/schemas/EP_F1C-Single'
EP_F1U:
$ref: '#/components/schemas/EP_F1U-Multiple'
- DRACHOptimizationFunction:
- $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
GnbCuUpFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
gnbId:
@@ -711,10 +678,8 @@
plmnInfoList:
$ref: '#/components/schemas/PlmnInfoList'
configurable5QISetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- dynamic5QISetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
RRMPolicyRatio:
@@ -733,12 +698,12 @@
$ref: '#/components/schemas/EP_S1U-Multiple'
GnbCuCpFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
gnbId:
@@ -756,18 +721,16 @@
x2WhiteList:
$ref: '#/components/schemas/GGnbIdList'
xnWhiteList:
- $ref: '#/components/schemas/GGnbIdList'
- x2XnHOBlackList:
+ $ref: '#/components/schemas/GGnbIdList '
+ xnHOBlackList:
+ $ref: '#/components/schemas/GGnbIdList '
+ x2HOBlackList:
$ref: '#/components/schemas/GEnbIdList'
mappingSetIDBackhaulAddress:
$ref: '#/components/schemas/MappingSetIDBackhaulAddress'
- tceMappingInfoList:
- $ref: '#/components/schemas/TceMappingInfoList'
configurable5QISetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- dynamic5QISetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
RRMPolicyRatio:
@@ -788,17 +751,19 @@
$ref: '#/components/schemas/DANRManagementFunction-Single'
DESManagementFunction:
$ref: '#/components/schemas/DESManagementFunction-Single'
+ DRACHOptimizationFunction:
+ $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
DMROFunction:
$ref: '#/components/schemas/DMROFunction-Single'
NrCellCu-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
cellLocalId:
@@ -806,8 +771,8 @@
plmnInfoList:
$ref: '#/components/schemas/PlmnInfoList'
nRFrequencyRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
RRMPolicyRatio:
@@ -822,27 +787,27 @@
$ref: '#/components/schemas/EUtranFreqRelation-Multiple'
DESManagementFunction:
$ref: '#/components/schemas/DESManagementFunction-Single'
+ DRACHOptimizationFunction:
+ $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
DMROFunction:
$ref: '#/components/schemas/DMROFunction-Single'
CESManagementFunction:
$ref: '#/components/schemas/CESManagementFunction-Single'
- DPCIConfigurationFunction:
- $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
NrCellDu-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
administrativeState:
- $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+ $ref: 'genericNRM.yaml#/components/schemas/AdministrativeState'
operationalState:
- $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+ $ref: 'genericNRM.yaml#/components/schemas/OperationalState'
cellLocalId:
type: integer
cellState:
@@ -882,70 +847,65 @@
nrSectorCarrierRef:
type: array
items:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
bwpRef:
type: array
items:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
nRFrequencyRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
victimSetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
aggressorSetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
RRMPolicyRatio:
$ref: '#/components/schemas/RRMPolicyRatio-Multiple'
+ DPCIConfigurationFunction:
+ $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
CPCIConfigurationFunction:
$ref: '#/components/schemas/CPCIConfigurationFunction-Single'
- DRACHOptimizationFunction:
- $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
NRFrequency-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
- - type: object
- properties:
- attributes:
- type: object
- properties:
- absoluteFrequencySSB:
- type: integer
- minimum: 0
- maximum: 3279165
- ssbSubCarrierSpacing:
- $ref: '#/components/schemas/SsbSubCarrierSpacing'
- multiFrequencyBandListNR:
- type: integer
- minimum: 1
- maximum: 256
- EUtranFrequency-Single:
- allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
- - type: object
- properties:
- attributes:
- type: object
- properties:
- earfcnDL:
- type: integer
- minimum: 0
- maximum: 262143
- multiBandInfoListEutra:
- type: integer
- minimum: 1
- maximum: 256
-
- NrSectorCarrier-Single:
- allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+ - type: object
+ properties:
+ absoluteFrequencySSB:
+ type: integer
+ minimum: 0
+ maximum: 3279165
+ ssbSubCarrierSpacing:
+ $ref: '#/components/schemas/SsbSubCarrierSpacing'
+ multiFrequencyBandListNR:
+ type: integer
+ minimum: 1
+ maximum: 256
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+ EUtranFrequency-Single:
+ allOf:
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+ - type: object
+ properties:
+ attributes:
+ $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+
+ NrSectorCarrier-Single:
+ allOf:
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+ - type: object
+ properties:
+ attributes:
+ allOf:
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
txDirection:
@@ -961,20 +921,20 @@
bSChannelBwUL:
type: integer
sectorEquipmentFunctionRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
CommonBeamformingFunction:
$ref: '#/components/schemas/CommonBeamformingFunction-Single'
Bwp-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
bwpContext:
@@ -989,10 +949,10 @@
type: integer
numberOfRBs:
type: integer
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
CommonBeamformingFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1011,7 +971,7 @@
$ref: '#/components/schemas/Beam-Multiple'
Beam-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1042,7 +1002,7 @@
maximum: 1800
RRMPolicyRatio-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1059,7 +1019,7 @@
NRCellRelation-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1070,9 +1030,9 @@
cellIndividualOffset:
$ref: '#/components/schemas/CellIndividualOffset'
adjacentNRCellRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
nRFrequencyRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
isRemoveAllowed:
type: boolean
isHOAllowed:
@@ -1083,20 +1043,20 @@
type: boolean
EUtranCellRelation-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
adjacentEUtranCellRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
NRFreqRelation-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1156,73 +1116,23 @@
tReselectionNRSfMedium:
$ref: '#/components/schemas/TReselectionNRSf'
nRFrequencyRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
EUtranFreqRelation-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
- type: object
- properties:
- cellIndividualOffset:
- $ref: '#/components/schemas/CellIndividualOffset'
- blackListEntry:
- type: array
- items:
- type: integer
- minimum: 0
- maximum: 1007
- blackListEntryIdleMode:
- type: integer
- cellReselectionPriority:
- type: integer
- cellReselectionSubPriority:
- type: number
- minimum: 0.2
- maximum: 0.8
- multipleOf: 0.2
- pMax:
- type: integer
- minimum: -30
- maximum: 33
- qOffsetFreq:
- $ref: '#/components/schemas/QOffsetFreq'
- qQualMin:
- type: number
- qRxLevMin:
- type: integer
- minimum: -140
- maximum: -44
- threshXHighP:
- type: integer
- minimum: 0
- maximum: 62
- threshXHighQ:
- type: integer
- minimum: 0
- maximum: 31
- threshXLowP:
- type: integer
- minimum: 0
- maximum: 62
- threshXLowQ:
- type: integer
- minimum: 0
- maximum: 31
- tReselectionEutran:
- type: integer
- minimum: 0
- maximum: 7
- tReselectionNRSfHigh:
- $ref: '#/components/schemas/TReselectionNRSf'
- tReselectionNRSfMedium:
- $ref: '#/components/schemas/TReselectionNRSf'
+ allOf:
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+ - type: object
+ properties:
eUTranFrequencyRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
DANRManagementFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1235,7 +1145,7 @@
DESManagementFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1260,17 +1170,17 @@
isProbingCapable:
type: string
enum:
- - yes
- - no
+ - yes
+ - no
energySavingState:
type: string
enum:
- - isNotEnergySaving
- - isEnergySaving
+ - isNotEnergySaving
+ - isEnergySaving
DRACHOptimizationFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1278,15 +1188,15 @@
properties:
drachOptimizationControl:
type: boolean
- ueAccProbilityDist:
- $ref: "#/components/schemas/UeAccProbilityDist"
- ueAccDelayProbilityDist:
- $ref: "#/components/schemas/UeAccDelayProbilityDist"
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ ueAccProbilityDistPerSSB:
+ $ref: "#/components/schemas/UeAccProbilityDistPerSSB"
+ ueAccDelayProbilityDistPerSSB:
+ $ref: "#/components/schemas/UeAccDelayProbilityDistPerSSB"
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
DMROFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1303,7 +1213,7 @@
DPCIConfigurationFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1316,7 +1226,7 @@
CPCIConfigurationFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1329,7 +1239,7 @@
CESManagementFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1340,17 +1250,17 @@
energySavingControl:
type: string
enum:
- - toBeEnergySaving
- - toBeNotEnergySaving
+ - toBeEnergySaving
+ - toBeNotEnergySaving
energySavingState:
type: string
enum:
- - isNotEnergySaving
- - isEnergySaving
+ - isNotEnergySaving
+ - isEnergySaving
RimRSGlobal-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1367,7 +1277,7 @@
RimRSSet-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
@@ -1392,23 +1302,23 @@
rimRSMonitoringOccasionStartingOffset:
type: integer
nRCellDURefs:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ $ref: 'genericNRM.yaml#/components/schemas/DnList'
ExternalGnbDuFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
gnbId:
$ref: '#/components/schemas/GnbId'
gnbIdLength:
$ref: '#/components/schemas/GnbIdLength'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
EP_F1C:
@@ -1417,19 +1327,19 @@
$ref: '#/components/schemas/EP_F1U-Multiple'
ExternalGnbCuUpFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
gnbId:
$ref: '#/components/schemas/GnbId'
gnbIdLength:
$ref: '#/components/schemas/GnbIdLength'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
EP_E1:
@@ -1440,13 +1350,13 @@
$ref: '#/components/schemas/EP_XnU-Multiple'
ExternalGnbCuCpFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- $ref: >-
- genericNrm.yaml#/components/schemas/ManagedFunction-Attr
+ genericNRM.yaml#/components/schemas/ManagedFunction-Attr
- type: object
properties:
gnbId:
@@ -1455,7 +1365,7 @@
$ref: '#/components/schemas/GnbIdLength'
plmnId:
$ref: '#/components/schemas/PlmnId'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
ExternalNrCellCu:
@@ -1468,12 +1378,12 @@
$ref: '#/components/schemas/EP_F1C-Multiple'
ExternalNrCellCu-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
cellLocalId:
@@ -1483,47 +1393,47 @@
plmnIdList:
$ref: '#/components/schemas/PlmnIdList'
nRFrequencyRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
ExternalENBFunction-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
eNBId:
type: integer
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
- type: object
properties:
ExternalEUTranCell:
$ref: '#/components/schemas/ExternalEUTranCell-Multiple'
ExternalEUTranCell-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
- type: object
properties:
EUtranFrequencyRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
- - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+ $ref: 'genericNRM.yaml#/components/schemas/Dn'
+ - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
EP_XnC-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1532,12 +1442,12 @@
$ref: '#/components/schemas/RemoteAddress'
EP_E1-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1546,12 +1456,12 @@
$ref: '#/components/schemas/RemoteAddress'
EP_F1C-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1560,12 +1470,12 @@
$ref: '#/components/schemas/RemoteAddress'
EP_NgC-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1574,12 +1484,12 @@
$ref: '#/components/schemas/RemoteAddress'
EP_X2C-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1588,12 +1498,12 @@
$ref: '#/components/schemas/RemoteAddress'
EP_XnU-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1602,12 +1512,12 @@
$ref: '#/components/schemas/RemoteAddress'
EP_F1U-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1616,29 +1526,26 @@
$ref: '#/components/schemas/RemoteAddress'
EP_NgU-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
$ref: '#/components/schemas/LocalAddress'
remoteAddress:
$ref: '#/components/schemas/RemoteAddress'
- epTransportRefs:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
-
EP_X2U-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1647,12 +1554,12 @@
$ref: '#/components/schemas/RemoteAddress'
EP_S1U-Single:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
- type: object
properties:
attributes:
allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+ - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
- type: object
properties:
localAddress:
@@ -1831,7 +1738,6 @@
- $ref: '#/components/schemas/CommonBeamformingFunction-Single'
- $ref: '#/components/schemas/Beam-Single'
- $ref: '#/components/schemas/RRMPolicyRatio-Single'
-
- $ref: '#/components/schemas/NRCellRelation-Single'
- $ref: '#/components/schemas/EUtranCellRelation-Single'
- $ref: '#/components/schemas/NRFreqRelation-Single'
@@ -1865,4 +1771,3 @@
- $ref: '#/components/schemas/EP_NgU-Single'
- $ref: '#/components/schemas/EP_X2U-Single'
- $ref: '#/components/schemas/EP_S1U-Single'
-
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/provMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/provMnS.yaml
similarity index 65%
rename from kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/provMnS.yaml
rename to kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/provMnS.yaml
index 1dd467e..b2f84a4 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/provMnS.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/provMnS.yaml
@@ -1,25 +1,25 @@
openapi: 3.0.1
info:
title: Provisioning MnS
- version: 16.5.0
+ version: 16.4.0
description: >-
OAS 3.0.1 definition of the Provisioning MnS
© 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
All rights reserved.
externalDocs:
- description: 3GPP TS 28.532; Generic management services
+ description: 3GPP TS 28.532 V16.4.0; Generic management services
url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
servers:
- - url: '{MnSRoot}/ProvMnS/{MnSVersion}/{URI-LDN-first-part}'
+ - url: 'http://{URI-DN-prefix}/{root}/ProvMnS/v1640/{LDN-first-part}'
variables:
- MnSRoot:
- description: See clause 4.4.2 of TS 32.158
- default: http://example.com/3GPPManagement
- MnSVersion:
- description: Version number of the OpenAPI definition
- default: XXX
- URI-LDN-first-part:
- description: See clause 4.4.2 of TS 32.158
+ URI-DN-prefix:
+ description: See subclause 4.4 of TS 32.158
+ default: example.com
+ root:
+ description: See subclause 4.4 of TS 32.158
+ default: 3GPPManagement
+ LDN-first-part:
+ description: See subclause 4.4 of TS 32.158
default: ''
paths:
'/{className}={id}':
@@ -28,12 +28,12 @@
in: path
required: true
schema:
- type: string
+ $ref: '#/components/schemas/className-PathType'
- name: id
in: path
required: true
schema:
- type: string
+ $ref: '#/components/schemas/id-PathType'
put:
summary: Replaces a complete single resource or creates it if it does not exist
description: >-
@@ -44,7 +44,7 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/Resource'
+ $ref: '#/components/schemas/resourcePut-RequestType'
responses:
'200':
description: >-
@@ -60,7 +60,7 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/Resource'
+ $ref: '#/components/schemas/resourceUpdate-ResponseType'
'201':
description: >-
Success case ("201 Created").
@@ -70,7 +70,7 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/Resource'
+ $ref: '#/components/schemas/resourceCreation-ResponseType'
'204':
description: >-
Success case ("204 No Content").
@@ -82,7 +82,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/error-ResponseType'
callbacks:
notifyMOICreation:
'{request.body#/notificationRecipientAddress}':
@@ -92,7 +92,7 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/NotifyMoiCreation'
+ $ref: '#/components/schemas/notifyMOICreation-NotifType'
responses:
'204':
description: >-
@@ -104,7 +104,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/error-ResponseType'
notifyMOIDeletion:
'{request.body#/notificationRecipientAddress}':
post:
@@ -113,7 +113,7 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/NotifyMoiDeletion'
+ $ref: '#/components/schemas/notifyMOIDeletion-NotifType'
responses:
'204':
description: >-
@@ -125,8 +125,8 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
- notifyMOIAttributeValueChanges:
+ $ref: '#/components/schemas/error-ResponseType'
+ notifyMOIAttributeValueChange:
'{request.body#/notificationRecipientAddress}':
post:
requestBody:
@@ -134,7 +134,7 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/NotifyMoiAttributeValueChanges'
+ $ref: '#/components/schemas/notifyMOIAttributeValueChange-NotifType'
responses:
'204':
description: >-
@@ -146,7 +146,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/error-ResponseType'
notifyMOIChanges:
'{request.body#/notificationRecipientAddress}':
post:
@@ -155,7 +155,7 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/NotifyMoiChanges'
+ $ref: '#/components/schemas/notifyMOIChanges-NotifType'
responses:
'204':
description: >-
@@ -167,7 +167,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/error-ResponseType'
get:
summary: Reads one or multiple resources
description: >-
@@ -183,7 +183,7 @@
mechanism is specified in the present document.
required: false
schema:
- $ref: '#/components/schemas/Scope'
+ $ref: '#/components/schemas/scope-QueryType'
style: form
explode: true
- name: filter
@@ -196,7 +196,7 @@
document.
required: false
schema:
- $ref: 'comDefs.yaml#/components/schemas/Filter'
+ $ref: '#/components/schemas/filter-QueryType'
- name: attributes
in: query
description: >-
@@ -204,9 +204,7 @@
are returned.
required: true
schema:
- type: array
- items:
- type: string
+ $ref: '#/components/schemas/attributes-QueryType'
style: form
explode: false
- name: fields
@@ -216,9 +214,7 @@
that are returned.
required: false
schema:
- type: array
- items:
- type: string
+ $ref: '#/components/schemas/fields-QueryType'
style: form
explode: false
responses:
@@ -233,13 +229,13 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/Resource'
+ $ref: '#/components/schemas/resourceRetrieval-ResponseType'
default:
description: Error case.
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/error-ResponseType'
patch:
summary: Patches one or multiple resources
description: >-
@@ -258,20 +254,16 @@
content:
application/merge-patch+json:
schema:
- $ref: '#/components/schemas/Resource'
+ $ref: '#/components/schemas/jsonMergePatch-RequestType'
application/3gpp-merge-patch+json:
schema:
- $ref: '#/components/schemas/Resource'
+ $ref: '#/components/schemas/3gppJsonMergePatch-RequestType'
application/json-patch+json:
schema:
- type: array
- items:
- type: object
+ $ref: '#/components/schemas/jsonPatch-RequestType'
application/3gpp-json-patch+json:
schema:
- type: array
- items:
- type: object
+ $ref: '#/components/schemas/3gppJsonPatch-RequestType'
responses:
'200':
description: >-
@@ -284,7 +276,7 @@
content:
application/json:
schema:
- $ref: '#/components/schemas/Resource'
+ $ref: '#/components/schemas/resourceUpdate-ResponseType'
'204':
description: >-
Success case ("204 No Content").
@@ -296,7 +288,7 @@
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/error-ResponseType'
delete:
summary: Deletes one or multiple resources
description: >-
@@ -311,9 +303,7 @@
mechanism is specified in the present document.
required: false
schema:
- $ref: '#/components/schemas/Scope'
- style: form
- explode: true
+ $ref: '#/components/schemas/scope-QueryType'
- name: filter
in: query
description: >-
@@ -324,7 +314,7 @@
document.
required: false
schema:
- $ref: 'comDefs.yaml#/components/schemas/Filter'
+ $ref: '#/components/schemas/filter-QueryType'
responses:
'200':
description: >-
@@ -341,66 +331,136 @@
content:
application/json:
schema:
- type: array
- items:
- $ref: 'comDefs.yaml#/components/schemas/Uri'
+ $ref: '#/components/schemas/resourceDeletion-ResponseType'
default:
description: Error case.
content:
application/json:
schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+ $ref: '#/components/schemas/error-ResponseType'
components:
schemas:
- CorrelatedNotification:
+ dateTime-Type:
+ type: string
+ format: date-time
+ long-Type:
+ type: integer
+ format: int64
+ uri-Type:
+ type: string
+ correlatedNotification-Type:
type: object
properties:
source:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: '#/components/schemas/uri-Type'
notificationIds:
type: array
items:
- $ref: 'comDefs.yaml#/components/schemas/NotificationId'
- required:
- - source
- - notificationIds
- CmNotificationTypes:
+ $ref: '#/components/schemas/notificationId-Type'
+ notificationId-Type:
+ $ref: '#/components/schemas/long-Type'
+ notificationType-Type:
type: string
enum:
- notifyMOICreation
- notifyMOIDeletion
- - notifyMOIAttributeValueChanges
- - notifyMOIChanges
- SourceIndicator:
+ - notifyMOIAttributeValueChange
+ systemDN-Type:
+ type: string
+ additionalText-Type:
+ type: string
+ sourceIndicator-Type:
type: string
enum:
- - RESOURCE_OPERATION
- - MANAGEMENT_OPERATION
- - SON_OPERATION
- - UNKNOWN
- Operation:
- type: string
- enum:
- - CREATE
- - DELETE
- - REPLACE
- ScopeType:
+ - resourceOperation
+ - mangementOperation
+ - sONOperation
+ - unknown
+ header-Type:
+ type: object
+ properties:
+ href:
+ $ref: '#/components/schemas/uri-Type'
+ notificationId:
+ $ref: '#/components/schemas/notificationId-Type'
+ notificationType:
+ $ref: '#/components/schemas/notificationType-Type'
+ eventTime:
+ $ref: '#/components/schemas/dateTime-Type'
+ systemDN:
+ $ref: '#/components/schemas/systemDN-Type'
+ required:
+ - href
+ - notificationId
+ - notificationType
+ - eventTime
+ - systemDN
+ scopeType-Type:
type: string
enum:
- BASE_ONLY
- BASE_NTH_LEVEL
- BASE_SUBTREE
- BASE_ALL
- Scope:
+ scopeLevel-Type:
+ type: integer
+ className-PathType:
+ type: string
+ id-PathType:
+ type: string
+ attributes-QueryType:
+ type: array
+ items:
+ type: string
+ fields-QueryType:
+ type: array
+ items:
+ type: string
+ filter-QueryType:
+ type: string
+ scope-QueryType:
type: object
properties:
scopeType:
- $ref: '#/components/schemas/ScopeType'
+ $ref: '#/components/schemas/scopeType-Type'
scopeLevel:
- type: integer
+ $ref: '#/components/schemas/scopeLevel-Type'
+ resourcePut-RequestType:
+ $ref: '#/components/schemas/resourceRepresentation-Type'
+ jsonMergePatch-RequestType:
+ $ref: '#/components/schemas/resourceRepresentation-Type'
+ 3gppJsonMergePatch-RequestType:
+ $ref: '#/components/schemas/resourceRepresentation-Type'
+ jsonPatch-RequestType:
+ type: array
+ items:
+ type: object
+ 3gppJsonPatch-RequestType:
+ type: array
+ items:
+ type: object
- Resource:
+ error-ResponseType:
+ type: object
+ properties:
+ error:
+ type: object
+ properties:
+ errorInfo:
+ type: string
+ resourceRetrieval-ResponseType:
+ $ref: '#/components/schemas/resourceRepresentation-Type'
+ resourceCreation-ResponseType:
+ $ref: '#/components/schemas/resourceRepresentation-Type'
+ resourceUpdate-ResponseType:
+ $ref: '#/components/schemas/resourceRepresentation-Type'
+ resourceDeletion-ResponseType:
+ type: array
+ items:
+ $ref: '#/components/schemas/uri-Type'
+
+ resourceRepresentation-Type:
oneOf:
- type: object
properties:
@@ -418,83 +478,102 @@
- $ref: '5gcNrm.yaml#/components/schemas/resources-5gcNrm'
- $ref: 'sliceNrm.yaml#/components/schemas/resources-sliceNrm'
- MoiChange:
+ mOIChange-Type:
type: object
properties:
notificationId:
- $ref: 'comDefs.yaml#/components/schemas/NotificationId'
+ $ref: '#/components/schemas/notificationId-Type'
correlatedNotifications:
type: array
items:
- $ref: '#/components/schemas/CorrelatedNotification'
+ $ref: '#/components/schemas/correlatedNotification-Type'
additionalText:
- type: string
+ $ref: '#/components/schemas/additionalText-Type'
sourceIndicator:
- $ref: '#/components/schemas/SourceIndicator'
+ $ref: '#/components/schemas/sourceIndicator-Type'
path:
- $ref: 'comDefs.yaml#/components/schemas/Uri'
+ $ref: '#/components/schemas/uri-Type'
operation:
- $ref: '#/components/schemas/Operation'
+ type: string
+ enum:
+ - CREATE
+ - DELETE
+ - REPLACE
value:
oneOf:
- - $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
- - $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+ - type: object
+ additionalProperties:
+ nullable: true
+ - type: array
+ items:
+ type: object
+ minItems: 1
+ maxItems: 2
- NotifyMoiCreation:
+ notifyMOICreation-NotifType:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/header-Type'
- type: object
properties:
correlatedNotifications:
type: array
items:
- $ref: '#/components/schemas/CorrelatedNotification'
+ $ref: '#/components/schemas/correlatedNotification-Type'
additionalText:
- type: string
+ $ref: '#/components/schemas/additionalText-Type'
sourceIndicator:
- $ref: '#/components/schemas/SourceIndicator'
+ $ref: '#/components/schemas/sourceIndicator-Type'
attributeList:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
- NotifyMoiDeletion:
+ type: object
+ additionalProperties:
+ nullable: true
+ notifyMOIDeletion-NotifType:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/header-Type'
- type: object
properties:
correlatedNotifications:
type: array
items:
- $ref: '#/components/schemas/CorrelatedNotification'
+ $ref: '#/components/schemas/correlatedNotification-Type'
additionalText:
- type: string
+ $ref: '#/components/schemas/additionalText-Type'
sourceIndicator:
- $ref: '#/components/schemas/SourceIndicator'
+ $ref: '#/components/schemas/sourceIndicator-Type'
attributeList:
- $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
- NotifyMoiAttributeValueChanges:
+ type: object
+ additionalProperties: true
+ notifyMOIAttributeValueChange-NotifType:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/header-Type'
- type: object
properties:
correlatedNotifications:
type: array
items:
- $ref: '#/components/schemas/CorrelatedNotification'
+ $ref: '#/components/schemas/correlatedNotification-Type'
additionalText:
- type: string
+ $ref: '#/components/schemas/additionalText-Type'
sourceIndicator:
- $ref: '#/components/schemas/SourceIndicator'
- attributeListValueChanges:
- $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+ $ref: '#/components/schemas/sourceIndicator-Type'
+ attributeValueChange:
+ type: object
+ additionalProperties:
+ type: array
+ minItems: 1
+ maxItems: 2
+ items:
+ nullable: true
required:
- - attributeListValueChanges
- NotifyMoiChanges:
+ - attributeValueChange
+ notifyMOIChanges-NotifType:
allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+ - $ref: '#/components/schemas/header-Type'
- type: object
properties:
- moiChanges:
+ mOIChanges:
type: array
items:
- $ref: '#/components/schemas/MoiChange'
+ $ref: '#/components/schemas/mOIChange-Type'
required:
- - moiChanges
+ - mOIChanges
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml
similarity index 66%
rename from kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml
rename to kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml
index 9bf5319..caf83ee 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml
@@ -1,7 +1,7 @@
openapi: 3.0.1
info:
title: Slice NRM
- version: 16.8.0
+ version: 16.4.0
description: >-
OAS 3.0.1 specification of the Slice NRM
@ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -30,68 +30,17 @@
enum:
- SHARED
- NON-SHARED
- NetworkSliceSharingIndicator:
- type: string
- enum:
- - SHARED
- - NON-SHARED
- PerfReqEmbb:
- type: object
- properties:
- expDataRateDL:
- type: number
- expDataRateUL:
- type: number
- areaTrafficCapDL:
- type: number
- areaTrafficCapUL:
- type: number
- userDensity:
- type: number
- activityFactor:
- type: number
- PerfReqEmbbList:
- type: array
- items:
- $ref: '#/components/schemas/PerfReqEmbb'
- PerfReqUrllc:
- type: object
- properties:
- cSAvailabilityTarget:
- type: number
- cSReliabilityMeanTime:
- type: string
- expDataRate:
- type: number
- msgSizeByte:
- type: string
- transferIntervalTarget:
- type: string
- survivalTime:
- type: string
- PerfReqUrllcList:
- type: array
- items:
- $ref: '#/components/schemas/PerfReqUrllc'
- PerfReq:
- oneOf:
- - $ref: '#/components/schemas/PerfReqEmbbList'
- - $ref: '#/components/schemas/PerfReqUrllcList'
Category:
type: string
enum:
- CHARACTER
- SCALABILITY
Tagging:
- type: array
- items:
- type: string
- enum:
- - PERFORMANCE
- - FUNCTION
- - OPERATION
-
-
+ type: string
+ enum:
+ - PERFORMANCE
+ - FUNCTION
+ - OPERATION
Exposure:
type: string
enum:
@@ -184,6 +133,13 @@
$ref: '#/components/schemas/ServAttrCom'
kPIList:
type: string
+ SupportedAccessTech:
+ type: object
+ properties:
+ servAttrCom:
+ $ref: '#/components/schemas/ServAttrCom'
+ accTechList:
+ type: integer
UserMgmtOpen:
type: object
properties:
@@ -212,13 +168,15 @@
type: string
nsName:
type: string
- ServiceProfile:
+ ServiceProfileList:
type: object
- properties:
- serviceProfileId:
- type: string
- plmnInfoList:
- $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
+ additionalProperties:
+ type: object
+ properties:
+ snssaiList:
+ $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
+ plmnIdList:
+ $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
maxNumberofUEs:
type: number
latency:
@@ -227,8 +185,8 @@
$ref: '#/components/schemas/MobilityLevel'
sst:
$ref: 'nrNrm.yaml#/components/schemas/Sst'
- networkSliceSharingIndicator:
- $ref: '#/components/schemas/NetworkSliceSharingIndicator'
+ resourceSharingLevel:
+ $ref: '#/components/schemas/SharingLevel'
availability:
type: number
delayTolerance:
@@ -249,6 +207,8 @@
$ref: '#/components/schemas/MaxNumberofConns'
kPIMonitoring:
$ref: '#/components/schemas/KPIMonitoring'
+ supportedAccessTech:
+ $ref: '#/components/schemas/SupportedAccessTech'
userMgmtOpen:
$ref: '#/components/schemas/UserMgmtOpen'
v2XModels:
@@ -267,16 +227,15 @@
type: string
reliability:
type: string
- SliceProfile:
+ SliceProfileList:
type: object
- properties:
- sliceProfileId:
- type: string
-
- plmnInfoList:
- $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
- perfReq:
- $ref: '#/components/schemas/PerfReq'
+ additionalProperties:
+ type: object
+ properties:
+ snssaiList:
+ $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
+ plmnIdList:
+ $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
maxNumberofUEs:
type: number
coverageAreaTAList:
@@ -292,39 +251,10 @@
oneOf:
- $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'
- $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'
- ServiceProfileList:
- type: array
- items:
- $ref: '#/components/schemas/ServiceProfile'
-
- SliceProfileList:
- type: array
- items:
- $ref: '#/components/schemas/SliceProfile'
#------------ Definition of concrete IOCs ----------------------------------------
- SubNetwork-Single:
- allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
- - type: object
- properties:
- attributes:
- allOf:
- - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
- - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO'
- - type: object
- properties:
- SubNetwork:
- $ref: '#/components/schemas/SubNetwork-Multiple'
- NetworkSlice:
- $ref: '#/components/schemas/NetworkSlice-Multiple'
- NetworkSliceSubnet:
- $ref: '#/components/schemas/NetworkSliceSubnet-Multiple'
- EP_Transport:
- $ref: '#/components/schemas/EP_Transport-Multiple'
-
- NetworkSlice-Single:
+ NetworkSlice:
allOf:
- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
- type: object
@@ -335,15 +265,15 @@
- type: object
properties:
networkSliceSubnetRef:
- $ref: 'comDefs.yaml#/components/schemas/Dn'
+ $ref: 'genericNrm.yaml#/components/schemas/Dn'
operationalState:
- $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+ $ref: 'genericNrm.yaml#/components/schemas/OperationalState'
administrativeState:
- $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+ $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
serviceProfileList:
$ref: '#/components/schemas/ServiceProfileList'
- NetworkSliceSubnet-Single:
+ NetworkSliceSubnet:
allOf:
- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
- type: object
@@ -354,19 +284,19 @@
- type: object
properties:
managedFunctionRefList:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ $ref: 'genericNrm.yaml#/components/schemas/DnList'
networkSliceSubnetRefList:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ $ref: 'genericNrm.yaml#/components/schemas/DnList'
operationalState:
- $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+ $ref: 'genericNrm.yaml#/components/schemas/OperationalState'
administrativeState:
- $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+ $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
nsInfo:
$ref: '#/components/schemas/NsInfo'
sliceProfileList:
$ref: '#/components/schemas/SliceProfileList'
- epTransportRefList:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
+ EPTransport:
+ $ref: '#/components/schemas/EP_Transport-Multiple'
EP_Transport-Single:
allOf:
@@ -384,24 +314,6 @@
type: string
qosProfile:
type: string
- epApplicationRefs:
- $ref: 'comDefs.yaml#/components/schemas/DnList'
-
-#-------- Definition of JSON arrays for name-contained IOCs ----------------------
- SubNetwork-Multiple:
- type: array
- items:
- $ref: '#/components/schemas/SubNetwork-Single'
-
- NetworkSlice-Multiple:
- type: array
- items:
- $ref: '#/components/schemas/NetworkSlice-Single'
-
- NetworkSliceSubnet-Multiple:
- type: array
- items:
- $ref: '#/components/schemas/NetworkSliceSubnet-Single'
EP_Transport-Multiple:
type: array
@@ -412,7 +324,5 @@
resources-sliceNrm:
oneOf:
- - $ref: '#/components/schemas/SubNetwork-Single'
- - $ref: '#/components/schemas/NetworkSlice-Single'
- - $ref: '#/components/schemas/NetworkSliceSubnet-Single'
- - $ref: '#/components/schemas/EP_Transport-Single'
+ - $ref: '#/components/schemas/NetworkSlice'
+ - $ref: '#/components/schemas/NetworkSliceSubnet'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/streamingDataMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/streamingDataMnS.yaml
new file mode 100644
index 0000000..f57454f
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/streamingDataMnS.yaml
@@ -0,0 +1,453 @@
+openapi: 3.0.1
+info:
+ title: TS 28.532 Streaming data reporting service
+ version: 16.4.0
+ description: OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS)
+servers:
+ - url: '{protocol}://{root}/StreamingDataReportingMnS/{version}'
+ variables:
+ protocol:
+ description: Protocol used
+ enum:
+ - http
+ - https
+ - wss
+ default: https
+ root:
+ description: Indicates the host name and optional port, and an optional sequence of path segments that together represent a prefix path.
+ default: example.com
+ version:
+ description: Indicates the current version of the specification
+ default: 16.4.0
+paths:
+ '/connections':
+ post:
+ summary: Inform consumer about reporting streams to be carried by the new connection and receive a new connection id.
+ description: Exchange of meta-data (producer informs consumer about its own identity and the nature of the data to be reported via streaming) phase of the connection establishement by streaming data reporting producer to the streaming data reporting consumer (i.e. streaming target).
+ requestBody:
+ required: true
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/connectionRequest-Type'
+ responses:
+ '201':
+ description: Success case (201 Created).
+ headers:
+ Location:
+ description: Location of the created connection resource.
+ schema:
+ $ref: '#/components/schemas/connectionId-Type'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/failedConnectionResponse-Type'
+ get:
+ summary: Obtain information about connections.
+ description: Enables the streaming data reporting service producer to obtain information about one or more streaming connections.
+ parameters:
+ - name: connectionIdList
+ in: query
+ description: The list of connectionId for which the connection information is to be returned.
+ required: false
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/connectionId-Type'
+ responses:
+ '200':
+ description: Success case (200 OK). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/connectionInfo-Type'
+ '202':
+ description: Partial success case (202 Partially retrieved). Subset of the resources identified in the request for retrieval are returned in the response message body.
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/connectionInfo-Type'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/errorResponse-Type'
+ '/connections/{connectionId}':
+ get:
+ summary: Obtain information about a connection.
+ description: Enables the streaming data reporting service producer to obtain information about one streaming connection.
+ parameters:
+ - name: connectionId
+ in: path
+ description: Indicate the ID (URI) of the connection for which the information is being retrieved
+ required: true
+ schema:
+ $ref: '#/components/schemas/connectionId-Type'
+ - name: Connection
+ in: header
+ schema:
+ $ref: '#/components/schemas/websocketHeaderConnection-Type'
+ - name: Sec-WebSocket-Extensions
+ in: header
+ schema:
+ $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Extensions-Type'
+ - name: Sec-WebSocket-Key
+ in: header
+ schema:
+ $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Key-Type'
+ - name: Sec-WebSocket-Protocol
+ in: header
+ schema:
+ $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Protocol-Type'
+ - name: Sec-WebSocket-Version
+ in: header
+ schema:
+ $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Version-Type'
+ responses:
+ '101':
+ description: Success case (101 Switching Protocols). The connection has been successfully switched to WebSocket. The response message body is absent.
+ headers:
+ Upgrade:
+ schema:
+ $ref: '#/components/schemas/websocketHeaderUpgrade-Type'
+ Connection:
+ schema:
+ $ref: '#/components/schemas/websocketHeaderConnection-Type'
+ Sec-WebSocket-Accept:
+ schema:
+ $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Accept-Type'
+ '200':
+ description: Success case (200 OK). The resource identified in the request for retrieval returned in the response message body.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/connectionInfo-Type'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/errorResponse-Type'
+ '/connections/{connectionId}/streams':
+ post:
+ summary: Inform consumer about new reporting streams on an existing connection.
+ description: Allows the producer to add one or more reporting streams to an already established streaming connection.
+ parameters:
+ - name: connectionId
+ in: path
+ description: Indicate the ID (URI) of the connection for which the reporting stream information is being added.
+ required: true
+ schema:
+ $ref: '#/components/schemas/connectionId-Type'
+ requestBody:
+ required: true
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfo-Type'
+ responses:
+ '201':
+ description: Success case (201 Posted).
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfo-Type'
+ '202':
+ description: Partial success case (202 Posted).
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfo-Type'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/errorResponse-Type'
+ delete:
+ summary: Remove reporting streams from an existing connection
+ description: Allows the producer to remove one or more reporting streams from an already established streaming connection.
+ parameters:
+ - name: connectionId
+ in: path
+ description: Indicate the ID (URI) of the connection for which the reporting stream information is being removed.
+ required: true
+ schema:
+ $ref: '#/components/schemas/connectionId-Type'
+ - name: streamIds
+ in: query
+ description: The list of streamId for the stream(s) to be deleted.
+ required: true
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamId-Type'
+ responses:
+ '204':
+ description: Success case (204 No Content). The stream information resource has been deleted. The response message body is absent.
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/errorResponse-Type'
+ get:
+ summary: Obtain information about streams.
+ description: Enables the streaming data reporting service producer to obtain information about one or more reporting streams.
+ parameters:
+ - name: connectionId
+ in: path
+ description: Indicate the ID (URI) of the connection for which the information is being retrieved
+ required: true
+ schema:
+ $ref: '#/components/schemas/connectionId-Type'
+ - name: streamIds
+ in: query
+ description: The list of streamId for which the stream information is to be retrieved.
+ required: true
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamId-Type'
+ responses:
+ '200':
+ description: Success case (200 OK).
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfoWithReporters-Type'
+ '202':
+ description: Partial success case (202 Partially retrieved).
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfoWithReporters-Type'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/errorResponse-Type'
+ '/connections/{connectionId}/streams/{streamId}':
+ get:
+ summary: Obtain information about stream
+ description: Enables the streaming data reporting service producer to obtain information about a reporting stream.
+ parameters:
+ - name: connectionId
+ in: path
+ description: Indicate the ID (URI) of the connection for which the information is being retrieved
+ required: true
+ schema:
+ $ref: '#/components/schemas/connectionId-Type'
+ - name: streamId
+ in: path
+ description: Indicate the ID of the reporting stream for which the information is being retrieved
+ required: true
+ schema:
+ $ref: '#/components/schemas/streamId-Type'
+ responses:
+ '200':
+ description: Success case (200 OK).
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/streamInfoWithReporters-Type'
+ default:
+ description: Error case.
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/errorResponse-Type'
+components:
+ schemas:
+ analyticsInfo-Type:
+ description: Information specific to analytics reporting.
+ type: object
+ properties:
+ activityDetails:
+ type: string
+ connectionId-Type:
+ $ref: '#/components/schemas/uri-Type'
+ connectionInfo-Type:
+ type: object
+ properties:
+ connection:
+ $ref: '#/components/schemas/connectionId-Type'
+ producer:
+ $ref: '#/components/schemas/producerId-Type'
+ streams:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamId-Type'
+ connectionRequest-Type:
+ type: object
+ properties:
+ producer:
+ $ref: '#/components/schemas/producerId-Type'
+ streams:
+ type: array
+ items:
+ $ref: '#/components/schemas/streamInfo-Type'
+ errorResponse-Type:
+ type: object
+ properties:
+ error:
+ type: object
+ properties:
+ errorInfo:
+ type: string
+ failedConnectionResponse-Type:
+ type: object
+ properties:
+ error:
+ type: array
+ items:
+ type: object
+ properties:
+ streamId:
+ $ref: '#/components/schemas/streamId-Type'
+ errorReason:
+ type: string
+ measObjDn-Type:
+ description: DN of the measured object instance (see 3GPP TS 28.550)
+ allOf:
+ - $ref: '#/components/schemas/systemDN-Type'
+ measTypes-Type:
+ description: an ordered list of measurement type or KPI whose measurement values or KPI result values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550) via this stream
+ type: array
+ items:
+ type: string
+ performanceInfo-Type:
+ description: Information specific to performance data reporting
+ type: object
+ properties:
+ measObjDn:
+ $ref: '#/components/schemas/measObjDn-Type'
+ measTypes:
+ $ref: '#/components/schemas/measTypes-Type'
+ measurementReaderId:
+ $ref: '#/components/schemas/systemDN-Type'
+ jobId:
+ type: string
+ required:
+ - measObjDn
+ - measTypes
+ producerId-Type:
+ description: DN of the streaming data reporting MnS producer.
+ allOf:
+ - $ref: '#/components/schemas/systemDN-Type'
+ serializationFormat-Type:
+ type: string
+ enum:
+ - GPB
+ - ASN1
+ streamId-Type:
+ description: globally unique stream identifier
+ type: string
+ example: '26F452550021'
+ streamInfo-Type:
+ description: Reporting stream meta-data.
+ type: object
+ properties:
+ streamType:
+ $ref: '#/components/schemas/streamType-Type'
+ serializationFormat:
+ $ref: '#/components/schemas/serializationFormat-Type'
+ streamId:
+ oneOf:
+ - $ref: '#/components/schemas/streamId-Type'
+ - $ref: '#/components/schemas/traceReference-Type'
+ additionalInfo:
+ oneOf:
+ - $ref: '#/components/schemas/traceInfo-Type'
+ - $ref: '#/components/schemas/performanceInfo-Type'
+ - $ref: '#/components/schemas/analyticsInfo-Type'
+ - $ref: '#/components/schemas/vsDataContainer-Type'
+ required:
+ - streamType
+ - serializationFormat
+ - streamId
+ streamInfoWithReporters-Type:
+ description: Reporting stream meta-data with added information about reporters.
+ type: object
+ properties:
+ streamInfo:
+ $ref: '#/components/schemas/streamInfo-Type'
+ reporters:
+ type: array
+ items:
+ $ref: '#/components/schemas/producerId-Type'
+ systemDN-Type:
+ description: See 3GPP TS 32.300 for details
+ type: string
+ example: 'SubNetwork=ABCNetwork,SubNetwork=MUC01,GNBDUFunction=XYZ0100'
+ streamType-Type:
+ type: string
+ enum:
+ - TRACE
+ - PERFORMANCE
+ - ANALYTICS
+ - PROPRIETARY
+ traceInfo-Type:
+ description: Information specific to trace data reporting
+ allOf:
+ - $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Attr'
+ traceReference-Type:
+ description: Trace Reference (see clause 5.6 of 3GPP TS 32.422) as stream identifier for streaming trace data reporting
+ type: string
+ example: '4358070034D7'
+ uri-Type:
+ description: Resource URI
+ type: string
+ vsDataContainer-Type:
+ description: container for vendor specific data (see 3GPP TS 28.622)
+ type: object
+ properties:
+ vsDataType:
+ type: string
+ vsData:
+ type: string
+ vsDataFormatVersion:
+ type: string
+ websocketHeaderConnection-Type:
+ description: Header value for the upgrade request and response.
+ type: string
+ enum:
+ - Upgrade
+ websocketHeaderUpgrade-Type:
+ description: Header value for the upgrade to WebSocket request and response.
+ type: string
+ enum:
+ - websocket
+ websocketHeader-Sec-WebSocket-Accept-Type:
+ description: Header value for secure WebSocket response. Carries hash.
+ type: string
+ websocketHeader-Sec-WebSocket-Extensions-Type:
+ description: Header value for secure WebSocket request. Carries protocol extensions.
+ type: string
+ websocketHeader-Sec-WebSocket-Key-Type:
+ description: Header value for secure WebSocket request. Provides information to the server which is needed in order to confirm that the client is entitled to request an upgrade to WebSocket.
+ type: string
+ websocketHeader-Sec-WebSocket-Protocol-Type:
+ description: Header value for secure WebSocket request. Carries a comma-separated list of subprotocol names, in the order of preference.
+ type: string
+ websocketHeader-Sec-WebSocket-Version-Type:
+ description: Header value for secure WebSocket request and response. Carries the WebSocket protocol version to be used.
+ type: string
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml
deleted file mode 100644
index 0528135..0000000
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml
+++ /dev/null
@@ -1,152 +0,0 @@
-openapi: 3.0.1
-info:
- title: Common Type Definitions
- version: 16.6.0
- description: >-
- OAS 3.0.1 specification of common type definitions in the Generic NRM
- © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
- All rights reserved.
-externalDocs:
- description: 3GPP TS 28.623; Generic NRM; Common type definitions
- url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
-paths: {}
-components:
- schemas:
-
- Float:
- type: number
- format: float
- DateTime:
- type: string
- format: date-Time
-
- Dn:
- type: string
- DnList:
- type: array
- items:
- $ref: '#/components/schemas/Dn'
-
- Mcc:
- type: string
- pattern: '^[0-9]{3}$'
- Mnc:
- type: string
- pattern: '^[0-9]{2,3}$'
- PlmnId:
- type: object
- properties:
- mcc:
- $ref: '#/components/schemas/Mcc'
- mnc:
- $ref: '#/components/schemas/Mnc'
- required:
- - mcc
- - mnc
-
- Fqdn:
- type: string
- Uri:
- type: string
-
- Ipv4Addr:
- type: string
- pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
- example: '198.51.100.1'
- Ipv6Addr:
- type: string
- allOf:
- - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'
- - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'
- example: '2001:db8:85a3::8a2e:370:7334'
- Ipv6Prefix:
- type: string
- allOf:
- - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$'
- - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$'
- example: '2001:db8:abcd:12::0/64'
-
- AdministrativeState:
- type: string
- enum:
- - LOCKED
- - UNLOCKED
- OperationalState:
- type: string
- enum:
- - ENABLED
- - DISABLED
- UsageState:
- type: string
- enum:
- - IDEL
- - ACTIVE
- - BUSY
-
- AttributeNameValuePairSet:
- description: >-
- The key of this map is the attribute name, and the value the attribute value.
- type: object
- minProperties: 1
- additionalProperties:
- nullable: true
- AttributeValueChangeSet:
- description: >-
- The first array item contains the attribute name value pairs with the new values,
- and the second array item the attribute name value pairs with the optional old values.
- type: array
- items:
- $ref: '#/components/schemas/AttributeNameValuePairSet'
- minItems: 1
- maxItems: 2
-
- Filter:
- type: string
- SystemDN:
- type: string
-
- NotificationId:
- type: integer
- NotificationType:
- oneOf:
- - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes'
- - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes'
- - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes'
- - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes'
- # The enum below will be replaced by a reference once notification
- # types are defined in "FileDataReportingMnS.yaml"
- - type: string
- enum:
- - notifyFileReady
- - notifyFilePreparationError
- NotificationHeader:
- type: object
- properties:
- href:
- $ref: '#/components/schemas/Uri'
- notificationId:
- $ref: '#/components/schemas/NotificationId'
- notificationType:
- $ref: '#/components/schemas/NotificationType'
- eventTime:
- $ref: '#/components/schemas/DateTime'
- systemDN:
- $ref: '#/components/schemas/SystemDN'
- required:
- - href
- - notificationId
- - notificationType
- - eventTime
- - systemDN
-
- ErrorResponse:
- description: >-
- Default schema for the response message body in case the request
- is not successful.
- type: object
- properties:
- error:
- type: object
- properties:
- errorInfo:
- type: string
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/heartbeatNtf.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/heartbeatNtf.yaml
deleted file mode 100644
index efa3185..0000000
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/heartbeatNtf.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-openapi: 3.0.1
-info:
- title: Heartbeat notification
- version: 16.6.0
- description: >-
- OAS 3.0.1 definition of the heartbeat notification
- © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
- All rights reserved.
-externalDocs:
- description: 3GPP TS 28.532 V16.6.0; Generic management services
- url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.6532/
-paths: {}
-components:
- schemas:
- HeartbeatNotificationTypes:
- type: string
- enum:
- - notifyHeartbeat
- NotifyHeartbeat:
- allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
- - type: object
- properties:
- heartbeatNtfPeriod:
- type: integer
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml
deleted file mode 100644
index dec6127..0000000
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-openapi: 3.0.1
-info:
- title: TS 28.532 Performance Threshold Monitoring MnS
- version: 16.6.0
- description: >-
- OAS 3.0.1 definition of the Performance Threshold Monitoring MnS
- © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
- All rights reserved.
-externalDocs:
- description: 3GPP TS 28.532 V16.6.0; Generic management services
- url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
-servers:
- - url: '{root}'
- variables:
- root:
- description: >-
- The open API server of the performance threshold monitoring service is
- located in the consumer side, see monitoringNotifTarget attribute of
- the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11].
- default: http://example.com/3GPPManagement
-paths:
- /notificationSink:
- post:
- summary: Send notifications about performance threshold crossing
- description: To send a notifyThresholdCrossing notification
- requestBody:
- required: true
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/NotifyThresholdCrossing'
- responses:
- '204':
- description: >-
- Success case ("204 No Content"). The notification is successfully
- delivered. The response message body is absent.
- default:
- description: Error case.
- content:
- application/json:
- schema:
- $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
-components:
- schemas:
- PerfNotificationTypes:
- type: string
- enum:
- - notifyThresholdCrossing
- PerfMetricValue:
- oneOf:
- - type: integer
- - $ref: 'comDefs.yaml#/components/schemas/Float'
- PerfMetricDirection:
- type: string
- enum:
- - UP
- - DOWN
- NotifyThresholdCrossing:
- allOf:
- - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
- - type: object
- properties:
- observedPerfMetricName:
- type: string
- observedPerfMetricValue:
- $ref: '#/components/schemas/PerfMetricValue'
- observedPerfMetricDirection:
- $ref: '#/components/schemas/PerfMetricDirection'
- thresholdValue:
- $ref: '#/components/schemas/PerfMetricValue'
- hysteresis:
- $ref: '#/components/schemas/PerfMetricValue'
- monitorGranularityPeriod:
- type: integer
- additionalText:
- type: string
diff --git a/kubernetes/dcaegen2-services/templates/configmap.yaml b/kubernetes/dcaegen2-services/templates/configmap.yaml
index 92662a2..798f2a7 100644
--- a/kubernetes/dcaegen2-services/templates/configmap.yaml
+++ b/kubernetes/dcaegen2-services/templates/configmap.yaml
@@ -37,7 +37,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.release" . }}-dcae-external-repo-configmap-sa91-rel16
+ name: {{ include "common.release" . }}-dcae-external-repo-configmap-sa88-rel16
namespace: {{ include "common.namespace" . }}
data:
-{{ (.Files.Glob "resources/external/schemas/sa91-rel16/*").AsConfig | indent 2 }}
\ No newline at end of file
+{{ (.Files.Glob "resources/external/schemas/sa88-rel16/*").AsConfig | indent 2 }}
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index 35c9249..22c3c49 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, AT&T, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP DCAE Gen2
name: dcaegen2
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
index c872e2e..f3127f7 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP DCAE Bootstrap
name: dcae-bootstrap
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
index b6eeb5b..4dcaff6 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
@@ -4,6 +4,7 @@
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Modifications (c) 2020 Nokia. All rights reserved.
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,18 +21,18 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
alias: postgres
- name: mongo
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
index 771d6a0..400c6b1 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP DCAE Cloudify Manager
name: dcae-cloudify-manager
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
index 877839e..590db41 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: cmpv2Config
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
index b5da7f3..49838a7 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Config Binding Service
name: dcae-config-binding-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
index f2c5b02..27373df 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
index 7a67595..7d1f13b 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
@@ -1,5 +1,23 @@
+#============LICENSE_START========================================================
+#=================================================================================
+# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
+# ================================================================================
+# 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.
+# ============LICENSE_END=========================================================
+
apiVersion: v1
appVersion: "1.0"
description: DCAE Dashboard
name: dcae-dashboard
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
index 8759678..ee68792 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
index c3f0fa1..5c3f785 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Deployment Handler
name: dcae-deployment-handler
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
index 78bcd76..8712aa9 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2019 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
index 0a0e942..d1af032 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP DCAE Health Check
name: dcae-healthcheck
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
index 3762a2a..747117c 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
index abd65d6..5411fa7 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Inventory API Service
name: dcae-inventory-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
index 32d8b5b..4138afb 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
index e1d41f2..ab42b43 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Policy Handler
name: dcae-policy-handler
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
index 78bcd76..8712aa9 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2019 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
index 61b98a7..a0a4e74 100644
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Service Change Handler
name: dcae-servicechange-handler
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
index f2c5b02..27373df 100644
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
index ae17610..4fc1ae2 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 Nokia. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE VES OpenApi Manager
name: dcae-ves-openapi-manager
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
index 9a3009d..3400a24 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
@@ -1,5 +1,6 @@
#============LICENSE_START========================================================
# Copyright (c) 2021 Nokia. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
index 206cfd0..b9aaa3a 100644
--- a/kubernetes/dcaegen2/requirements.yaml
+++ b/kubernetes/dcaegen2/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,45 +16,45 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcae-bootstrap
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-bootstrap'
condition: dcae-bootstrap.enabled
- name: dcae-cloudify-manager
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-cloudify-manager'
condition: dcae-cloudify-manager.enabled
- name: dcae-config-binding-service
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-config-binding-service'
condition: dcae-config-binding-service.enabled
- name: dcae-healthcheck
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-healthcheck'
condition: dcae-healthcheck.enabled
- name: dcae-servicechange-handler
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-servicechange-handler'
condition: dcae-servicechange-handler.enabled
- name: dcae-inventory-api
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-inventory-api'
condition: dcae-inventory-api.enabled
- name: dcae-deployment-handler
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-deployment-handler'
condition: dcae-deployment-handler.enabled
- name: dcae-policy-handler
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-policy-handler'
condition: dcae-policy-handler.enabled
- name: dcae-dashboard
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-dashboard'
condition: dcae-dashboard.enabled
- name: dcae-ves-openapi-manager
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcae-ves-openapi-manager'
condition: dcae-ves-openapi-manager.enabled
diff --git a/kubernetes/dcaemod/Chart.yaml b/kubernetes/dcaemod/Chart.yaml
index b5d84f6..b198e4d 100644
--- a/kubernetes/dcaemod/Chart.yaml
+++ b/kubernetes/dcaemod/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE MOD
name: dcaemod
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
index c6572de..09c8942 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE MOD Design Tool
name: dcaemod-designtool
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
index 233f6e4..31acb0b 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
index 9245bc9..9c43059 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE MOD Distributor API
name: dcaemod-distributor-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
index 2684426..1f77713 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
index e1885a2..acabde6 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE MOD Genprocessor
name: dcaemod-genprocessor
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
index 2684426..1f77713 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
index 929eb67..95f140a 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP DCAE MOD Health Check
name: dcaemod-healthcheck
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
index 3762a2a..747117c 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
index cf1b896..6bd9046 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE MOD Nifi Registry
name: dcaemod-nifi-registry
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
index 2684426..1f77713 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
index ec660c2..1595250 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE MOD Onboarding API
name: dcaemod-onboarding-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
index 9320cd0..396cf7a 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,14 +18,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
index cb7715e..814e1df 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE MOD Runtime API
name: dcaemod-runtime-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
index 2684426..1f77713 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/requirements.yaml b/kubernetes/dcaemod/requirements.yaml
index 649e3be..0ecbc55 100644
--- a/kubernetes/dcaemod/requirements.yaml
+++ b/kubernetes/dcaemod/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,33 +15,33 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: dcaemod-genprocessor
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcaemod-genprocessor'
condition: dcaemod-genprocessor.enabled
- name: dcaemod-distributor-api
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcaemod-distributor-api'
condition: dcaemod-distributor-api.enabled
- name: dcaemod-designtool
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcaemod-designtool'
condition: dcaemod-designtool.enabled
- name: dcaemod-onboarding-api
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcaemod-onboarding-api'
condition: dcaemod-onboarding-api.enabled
- name: dcaemod-runtime-api
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcaemod-runtime-api'
condition: dcaemod-runtime-api.enabled
- name: dcaemod-nifi-registry
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcaemod-nifi-registry'
condition: dcaemod-nifi-registry.enabled
- name: dcaemod-healthcheck
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dcaemod-healthcheck'
condition: dcaemod-healthcheck.enabled
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index c57858d..e0b0c38 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs,Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP DMaaP components
name: dmaap
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index 0b6b3bf..433c065 100644
--- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs,Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
name: dmaap-bc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
index 7c26bb8..10a617d 100644
--- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: PG.enabled
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index a3d42d2..a8e7cf9 100644
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
@@ -40,7 +40,7 @@
pullPolicy: Always
# application images
-image: onap/dmaap/dmaap-bc:2.0.6
+image: onap/dmaap/dmaap-bc:2.0.8
# application configuration
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
index bc9a734..87b5fa1 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP DMaaP Data Router Node Server
name: dmaap-dr-node
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
index b7e9dce..4feb42d 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
@@ -1,6 +1,7 @@
#
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,14 +21,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index ced7005..eb6a488 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -43,7 +43,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/dmaap/datarouter-node:2.1.8
+image: onap/dmaap/datarouter-node:2.1.9
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
index 5b0666e..94fc443 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP DMaaP Data Router Provisioning Server
name: dmaap-dr-prov
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
index 3c25c94..01d481a 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
@@ -1,6 +1,7 @@
#
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,21 +21,21 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index cf25468..a183356 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -41,7 +41,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/dmaap/datarouter-prov:2.1.8
+image: onap/dmaap/datarouter-prov:2.1.9
pullPolicy: Always
# flag to enable debugging - application support required
@@ -106,7 +106,7 @@
name: &mysqlDbName datarouter
user: datarouter
# password:
- externalSecret: *dbUserSecretName
+ externalSecret: *dbUserSecretName
service:
name: *dbServer
nfsprovisionerPrefix: dmaap-dr-db
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
index 637395f..7bd389e 100644
--- a/kubernetes/dmaap/components/message-router/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Message Router
name: message-router
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
index 3e4bb7f..76a4883 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Message Router Kafka Service
name: message-router-kafka
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
index c212f38..f85585d 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,17 +16,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
index 5732c5d..16a4c0f 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
@@ -53,7 +53,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/dmaap/kafka111:1.0.5
+image: onap/dmaap/kafka111:1.1.1
pullPolicy: Always
@@ -83,11 +83,9 @@
"log.dirs": "/var/lib/kafka/data"
"log.retention.hours": "168"
"num.partitions": "3"
- "offsets.topic.replication.factor": "3"
"transaction.state.log.replication.factor": "1"
"transaction.state.log.min.isr": "1"
"num.recovery.threads.per.data.dir": "5"
- "log.retention.hours": "168"
"zookeeper.connection.timeout.ms": "6000"
"default.replication.factor": "3"
"zookeeper.set.acl": "true"
@@ -151,7 +149,7 @@
# probe configuration parameters
liveness:
- initialDelaySeconds: 70
+ initialDelaySeconds: 90
periodSeconds: 20
timeoutSeconds: 10
# necessary to disable liveness probe when setting breakpoints
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
index 566d14f..c3a1282 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Dmaap Message Router Zookeeper Service
name: message-router-zookeeper
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
index 20cc48f..74c05f4 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/_zkservers.tpl b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/_zkservers.tpl
new file mode 100644
index 0000000..8b88d7b
--- /dev/null
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/_zkservers.tpl
@@ -0,0 +1,16 @@
+{{/*
+Create a server list string based on fullname, namespace, # of zookeeperServers
+in a format like "zkhost1:port:port;zkhost2:port:port"
+*/}}
+{{- define "zookeeper.serverlist" -}}
+{{- $namespace := include "common.namespace" . }}
+{{- $fullname := include "common.fullname" . -}}
+{{- $name := include "common.name" . -}}
+{{- $serverPort := .Values.service.serverPort -}}
+{{- $leaderElectionPort := .Values.service.leaderElectionPort -}}
+{{- $zk := dict "zookeeperServers" (list) -}}
+{{- range $idx, $v := until (int .Values.zookeeperServers) }}
+{{- $noop := printf "%s-%d.%s.%s.svc.cluster.local:%d:%d" $fullname $idx $name $namespace (int $serverPort) (int $leaderElectionPort) | append $zk.zookeeperServers | set $zk "zookeeperServers" -}}
+{{- end }}
+{{- printf "%s" (join ";" $zk.zookeeperServers) | quote -}}
+{{- end -}}
\ No newline at end of file
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
index f5473ec..cac75b1 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
@@ -125,14 +125,14 @@
{{ if eq .Values.liveness.enabled true }}
livenessProbe:
exec:
- command: ['/bin/bash', '-c', 'echo "ruok" | nc -w 2 -q 2 localhost 2181 | grep imok']
+ command: ['/bin/bash', '-c', 'echo "ruok" | nc -w 2 localhost 2181 | grep imok']
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
{{ end }}
readinessProbe:
exec:
- command: ['/bin/bash', '-c', 'echo "ruok" | nc -w 2 -q 2 localhost 2181 | grep imok']
+ command: ['/bin/bash', '-c', 'echo "ruok" | nc -w 2 localhost 2181 | grep imok']
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
@@ -165,6 +165,8 @@
value: "{{ .Values.zkConfig.kafkaOpts }}"
- name: ZOOKEEPER_QUORUM_LISTEN_ON_ALL_IPS
value: "true"
+ - name: ZOOKEEPER_SERVERS
+ value: {{ template "zookeeper.serverlist" . }}
- name: ZOOKEEPER_SERVER_ID
valueFrom:
fieldRef:
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
index 6863acc..fae361a 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
@@ -24,7 +24,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/dmaap/zookeeper:6.0.3
+image: onap/dmaap/zookeeper:6.1.0
pullPolicy: Always
# flag to enable debugging - application support required
@@ -34,6 +34,8 @@
# default number of instances
replicaCount: 3
+zookeeperServers: 3
+
nodeSelector: {}
nodeAffinity: {}
@@ -44,7 +46,7 @@
# probe configuration parameters
liveness:
- initialDelaySeconds: 40
+ initialDelaySeconds: 60
periodSeconds: 20
timeoutSeconds: 10
# necessary to disable liveness probe when setting breakpoints
@@ -52,7 +54,7 @@
enabled: true
readiness:
- initialDelaySeconds: 40
+ initialDelaySeconds: 60
periodSeconds: 20
timeoutSeconds: 10
@@ -60,12 +62,12 @@
zkConfig:
tickTime: 2000
syncLimit: 5
- initLimit: 10
+ initLimit: 20
maxClientCnxns: 200
autoPurgeSnapRetainCount: 3
autoPurgePurgeInterval: 24
heapOptions: -Xmx2G -Xms2G
- kafkaOpts: -Djava.security.auth.login.config=/etc/zookeeper/secrets/jaas/zk_server_jaas.conf -Dzookeeper.kerberos.removeHostFromPrincipal=true -Dzookeeper.kerberos.removeRealmFromPrincipal=true -Dzookeeper.authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider -Dzookeeper.requireClientAuthScheme=sasl
+ kafkaOpts: -Djava.security.auth.login.config=/etc/zookeeper/secrets/jaas/zk_server_jaas.conf -Dzookeeper.kerberos.removeHostFromPrincipal=true -Dzookeeper.kerberos.removeRealmFromPrincipal=true -Dzookeeper.authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider -Dzookeeper.requireClientAuthScheme=sasl -Dzookeeper.4lw.commands.whitelist=*
clientPort: 2181
jmx:
diff --git a/kubernetes/dmaap/components/message-router/requirements.yaml b/kubernetes/dmaap/components/message-router/requirements.yaml
index 00d1454..4dfa82b 100644
--- a/kubernetes/dmaap/components/message-router/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/requirements.yaml
@@ -16,23 +16,23 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: message-router-kafka
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/message-router-kafka'
- name: message-router-zookeeper
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/message-router-zookeeper'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 7028bb1..44697d7 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -60,7 +60,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/dmaap/dmaap-mr:1.1.20
+image: onap/dmaap/dmaap-mr:1.3.0
pullPolicy: Always
kafka:
diff --git a/kubernetes/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml
index 268ff70..b1a8f3a 100644
--- a/kubernetes/dmaap/requirements.yaml
+++ b/kubernetes/dmaap/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs,Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,24 +16,24 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: message-router
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/message-router'
condition: message-router.enabled
- name: dmaap-bc
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dmaap-bc'
condition: dmaap-bc.enabled
- name: dmaap-dr-node
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dmaap-dr-node'
condition: dmaap-dr-node.enabled
- name: dmaap-dr-prov
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dmaap-dr-prov'
condition: dmaap-dr-prov.enabled
- name: serviceAccount
- version: ~8.x-0
- repository: '@local'
\ No newline at end of file
+ version: ~9.x-0
+ repository: '@local'
diff --git a/kubernetes/helm/starters/onap-app/Chart.yaml b/kubernetes/helm/starters/onap-app/Chart.yaml
index d039f44..87a62ed 100644
--- a/kubernetes/helm/starters/onap-app/Chart.yaml
+++ b/kubernetes/helm/starters/onap-app/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: <Short application description - this is visible via 'helm search'>
name: <onap-app>
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/helm/starters/onap-app/requirements.yaml
+++ b/kubernetes/helm/starters/onap-app/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/holmes/Chart.yaml b/kubernetes/holmes/Chart.yaml
index b6717ef..b636d38 100644
--- a/kubernetes/holmes/Chart.yaml
+++ b/kubernetes/holmes/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 ZTE
+# Modifications Copyright © 2021 ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP DCAE HOLMES
name: holmes
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
index 31c0906..4df9ff0 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
@@ -1,5 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 ZTE
+# Modifications Copyright © 2021 Orange
+#
+# 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.
+
apiVersion: v1
appVersion: "1.0"
description: Holmes Engine Management
name: holmes-engine-mgmt
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
index ab839d0..2e9004a 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
index ba40234..f98c78b 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
@@ -1,5 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 ZTE
+# Modifications Copyright © 2021 Orange
+#
+# 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.
+
apiVersion: v1
appVersion: "1.0"
description: Holmes Rule Management
name: holmes-rule-mgmt
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
index ab839d0..2e9004a 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index 6261b4e..0624882 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -25,7 +25,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/holmes/rule-management:9.0.0
+image: onap/holmes/rule-management:9.0.1
consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
#################################################################
diff --git a/kubernetes/holmes/requirements.yaml b/kubernetes/holmes/requirements.yaml
index 3903636..d1200fd 100644
--- a/kubernetes/holmes/requirements.yaml
+++ b/kubernetes/holmes/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: holmes-rule-mgmt
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/holmes-rule-mgmt'
- name: holmes-engine-mgmt
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/holmes-engine-mgmt'
diff --git a/kubernetes/log/Chart.yaml b/kubernetes/log/Chart.yaml
index 7a183f6..0df7470 100644
--- a/kubernetes/log/Chart.yaml
+++ b/kubernetes/log/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Logging ElasticStack
name: log
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/log/components/log-elasticsearch/Chart.yaml b/kubernetes/log/components/log-elasticsearch/Chart.yaml
index 6ea1c79..719f6ad 100644
--- a/kubernetes/log/components/log-elasticsearch/Chart.yaml
+++ b/kubernetes/log/components/log-elasticsearch/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Logging Elasticsearch
name: log-elasticsearch
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/log/components/log-elasticsearch/requirements.yaml b/kubernetes/log/components/log-elasticsearch/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/log/components/log-elasticsearch/requirements.yaml
+++ b/kubernetes/log/components/log-elasticsearch/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/log/components/log-kibana/Chart.yaml b/kubernetes/log/components/log-kibana/Chart.yaml
index 0b8c432..cfa1c88 100644
--- a/kubernetes/log/components/log-kibana/Chart.yaml
+++ b/kubernetes/log/components/log-kibana/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Logging Kibana
name: log-kibana
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/log/components/log-kibana/requirements.yaml b/kubernetes/log/components/log-kibana/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/log/components/log-kibana/requirements.yaml
+++ b/kubernetes/log/components/log-kibana/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/log/components/log-logstash/Chart.yaml b/kubernetes/log/components/log-logstash/Chart.yaml
index 543b1f5..aca2909 100644
--- a/kubernetes/log/components/log-logstash/Chart.yaml
+++ b/kubernetes/log/components/log-logstash/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Logging Logstash
name: log-logstash
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/log/components/log-logstash/requirements.yaml b/kubernetes/log/components/log-logstash/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/log/components/log-logstash/requirements.yaml
+++ b/kubernetes/log/components/log-logstash/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml
index aba35bc..ba744af 100644
--- a/kubernetes/log/requirements.yaml
+++ b/kubernetes/log/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: log-elasticsearch
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/log-elasticsearch'
- name: log-kibana
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/log-kibana'
- name: log-logstash
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/log-logstash'
diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml
index ea1e28b..7e7be74 100644
--- a/kubernetes/modeling/Chart.yaml
+++ b/kubernetes/modeling/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Modeling (Modeling)
name: modeling
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
index fcac20b..942915b 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Modeling - Etsicatalog
name: modeling-etsicatalog
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
index 6070b0c..686d936 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samung Electronics
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/modeling/requirements.yaml b/kubernetes/modeling/requirements.yaml
index e2f7a75..af247fc 100644
--- a/kubernetes/modeling/requirements.yaml
+++ b/kubernetes/modeling/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
dependencies:
- name: modeling-etsicatalog
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/modeling-etsicatalog'
diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml
index 9c9ae56..14eb4d3 100644
--- a/kubernetes/msb/Chart.yaml
+++ b/kubernetes/msb/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 ZTE
+# Modifications Copyright © 2018 ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP MicroServices Bus
name: msb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/kube2msb/Chart.yaml b/kubernetes/msb/components/kube2msb/Chart.yaml
index 70dd462..dcafd05 100644
--- a/kubernetes/msb/components/kube2msb/Chart.yaml
+++ b/kubernetes/msb/components/kube2msb/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Kube2MSB Registrator
name: kube2msb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/kube2msb/requirements.yaml b/kubernetes/msb/components/kube2msb/requirements.yaml
index f783c76..dbb7638 100644
--- a/kubernetes/msb/components/kube2msb/requirements.yaml
+++ b/kubernetes/msb/components/kube2msb/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,8 +14,8 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-consul/Chart.yaml b/kubernetes/msb/components/msb-consul/Chart.yaml
index 9666dc6..7f8ba44 100644
--- a/kubernetes/msb/components/msb-consul/Chart.yaml
+++ b/kubernetes/msb/components/msb-consul/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Consul
name: msb-consul
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/msb-consul/requirements.yaml b/kubernetes/msb/components/msb-consul/requirements.yaml
index f783c76..dbb7638 100644
--- a/kubernetes/msb/components/msb-consul/requirements.yaml
+++ b/kubernetes/msb/components/msb-consul/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,8 +14,8 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-discovery/Chart.yaml b/kubernetes/msb/components/msb-discovery/Chart.yaml
index 50465b9..4bb3e2b 100644
--- a/kubernetes/msb/components/msb-discovery/Chart.yaml
+++ b/kubernetes/msb/components/msb-discovery/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Discovery
name: msb-discovery
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/msb-discovery/requirements.yaml b/kubernetes/msb/components/msb-discovery/requirements.yaml
index f783c76..dbb7638 100644
--- a/kubernetes/msb/components/msb-discovery/requirements.yaml
+++ b/kubernetes/msb/components/msb-discovery/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,8 +14,8 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-eag/Chart.yaml b/kubernetes/msb/components/msb-eag/Chart.yaml
index 8557bf2..bdb7498 100644
--- a/kubernetes/msb/components/msb-eag/Chart.yaml
+++ b/kubernetes/msb/components/msb-eag/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Internal API Gateway
name: msb-eag
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/msb-eag/requirements.yaml b/kubernetes/msb/components/msb-eag/requirements.yaml
index 1a256d1..3fea5d0 100644
--- a/kubernetes/msb/components/msb-eag/requirements.yaml
+++ b/kubernetes/msb/components/msb-eag/requirements.yaml
@@ -14,11 +14,11 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-eag/values.yaml b/kubernetes/msb/components/msb-eag/values.yaml
index ef36b13..5faae36 100644
--- a/kubernetes/msb/components/msb-eag/values.yaml
+++ b/kubernetes/msb/components/msb-eag/values.yaml
@@ -52,7 +52,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/msb/msb_apigateway:1.3.0
+image: onap/msb/msb_apigateway:1.3.1
pullPolicy: Always
istioSidecar: true
diff --git a/kubernetes/msb/components/msb-iag/Chart.yaml b/kubernetes/msb/components/msb-iag/Chart.yaml
index ceec797..38872ab 100644
--- a/kubernetes/msb/components/msb-iag/Chart.yaml
+++ b/kubernetes/msb/components/msb-iag/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Internal API Gateway
name: msb-iag
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/msb-iag/requirements.yaml b/kubernetes/msb/components/msb-iag/requirements.yaml
index 1a256d1..3fea5d0 100644
--- a/kubernetes/msb/components/msb-iag/requirements.yaml
+++ b/kubernetes/msb/components/msb-iag/requirements.yaml
@@ -14,11 +14,11 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml
index 4610232..9b9f805 100644
--- a/kubernetes/msb/components/msb-iag/values.yaml
+++ b/kubernetes/msb/components/msb-iag/values.yaml
@@ -52,7 +52,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/msb/msb_apigateway:1.3.0
+image: onap/msb/msb_apigateway:1.3.1
pullPolicy: Always
istioSidecar: true
diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml
index f365479..3adce0f 100644
--- a/kubernetes/msb/requirements.yaml
+++ b/kubernetes/msb/requirements.yaml
@@ -1,5 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,23 +14,23 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: kube2msb
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/kube2msb'
- name: msb-consul
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/msb-consul'
- name: msb-discovery
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/msb-discovery'
- name: msb-eag
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/msb-eag'
- name: msb-iag
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/msb-iag'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 8093d70..ff43734 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP multicloud broker
name: multicloud
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
index 95b82ab..1b55afc 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019, CMCC Technologies Co., Ltd.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack fcaps Plugin
name: multicloud-fcaps
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
index 105721c..813ed1b 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2019 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Multicloud Kubernetes Plugin
name: multicloud-k8s
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
index acbc39b..434abf9 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2019 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: mongo
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: etcd
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
index 19f24e3..e150ef3 100644
--- a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2018 Intel Corporation.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack Pike Plugin
name: multicloud-pike
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
index 4280c33..f1e00cd 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Multicloud Prometheus
name: multicloud-prometheus
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
index 203c6ee..16a126a 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Multicloud Prometheus Alert Manager
name: prometheus-alertmanager
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
index 7ae66c6..a6df6e1 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Multicloud Grafana for Prometheus
name: prometheus-grafana
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
index fb61cca..09630f0 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: prometheus-alertmanager
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/prometheus-alertmanager'
- name: prometheus-grafana
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/prometheus-grafana'
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
index 9c6ce77..17e33ef 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (c) 2019 Intel Corporation.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack Starlingx Plugin
name: multicloud-starlingx
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
index df18003..2247c33 100644
--- a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP multicloud VIO plugin
name: multicloud-vio
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
index ddeca7c..3291c83 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack WindRiver Plugin
name: multicloud-windriver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
index 7b909eb..2af2eb9 100644
--- a/kubernetes/multicloud/requirements.yaml
+++ b/kubernetes/multicloud/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,36 +16,36 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: multicloud-fcaps
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/multicloud-fcaps'
condition: multicloud-fcaps.enabled
- name: multicloud-k8s
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/multicloud-k8s'
condition: multicloud-k8s.enabled
- name: multicloud-pike
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/multicloud-pike'
condition: multicloud-pike.enabled
- name: multicloud-prometheus
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/multicloud-prometheus'
condition: multicloud-prometheus.enabled
- name: multicloud-starlingx
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/multicloud-starlingx'
condition: multicloud-starlingx.enabled
- name: multicloud-vio
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/multicloud-vio'
condition: multicloud-vio.enabled
- name: multicloud-windriver
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/multicloud-windriver'
condition: multicloud-windriver.enabled
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index 562714c..78929b7 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 Orange
+# Modifications Copyright © 2018,2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Northbound Interface
name: nbi
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/nbi/requirements.yaml b/kubernetes/nbi/requirements.yaml
index 7062a13..f54b915 100644
--- a/kubernetes/nbi/requirements.yaml
+++ b/kubernetes/nbi/requirements.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 Orange
+# Modifications Copyright © 2018,2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,25 +15,25 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mongo
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 94bf304..21ff5a5 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -14,11 +14,11 @@
apiVersion: v1
name: onap
-version: 8.0.0
-appVersion: Guilin
+version: 9.0.0
+appVersion: Istanbul
description: Open Network Automation Platform (ONAP)
home: https://www.onap.org/
sources:
- https://gerrit.onap.org/r/#/admin/projects/
icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
-kubeVersion: ">=1.11.5-0"
+kubeVersion: ">=1.19"
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 61d4314..694546f 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -1,6 +1,7 @@
# Copyright © 2019 Amdocs, Bell Canada
# Copyright (c) 2020 Nordix Foundation, Modifications
# Modifications Copyright © 2020 Nokia
+# Modifications Copyright © 2020-2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,152 +21,160 @@
# > helm repo add local http://127.0.0.1:8879
dependencies:
- name: aaf
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: aaf.enabled
- name: aai
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: aai.enabled
- name: appc
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: appc.enabled
- name: cassandra
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: cassandra.enabled
- name: cds
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: cds.enabled
- name: cli
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: cli.enabled
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: consul
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: consul.enabled
- name: contrib
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.addTestingComponents
- name: cps
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: cps.enabled
- name: dcaegen2
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcaegen2.enabled
- name: dcaegen2-services
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcaegen2-services.enabled
- name: dcaemod
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dcaemod.enabled
- name: holmes
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: holmes.enabled
- name: dmaap
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dmaap.enabled
- name: log
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: log.enabled
- name: sniro-emulator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: sniro-emulator.enabled
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: mariadb-galera.enabled
- name: msb
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: msb.enabled
- name: multicloud
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: multicloud.enabled
- name: nbi
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: nbi.enabled
- name: policy
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: policy.enabled
- name: portal
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: portal.enabled
+ - name: postgres
+ version: ~9.x-0
+ repository: '@local'
+ condition: postgres.enabled
- name: oof
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: oof.enabled
- name: repository-wrapper
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: robot
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: robot.enabled
- name: sdc
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: sdc.enabled
- name: sdnc
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: sdnc.enabled
- name: so
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: so.enabled
- name: uui
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: uui.enabled
- name: vfc
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: vfc.enabled
- name: vid
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: vid.enabled
- name: vnfsdk
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: vnfsdk.enabled
- name: modeling
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: modeling.enabled
- name: platform
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: platform.enabled
- name: a1policymanagement
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: a1policymanagement.enabled
- name: cert-wrapper
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: cert-wrapper.enabled
- name: roles-wrapper
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: roles-wrapper.enabled
+ - name: timescaledb
+ version: ~9.x-0
+ repository: '@local'
+ condition: timescaledb.enabled
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 91e0157..229717a 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -1,6 +1,7 @@
# Copyright © 2019 Amdocs, Bell Canada
# Copyright (c) 2020 Nordix Foundation, Modifications
# Modifications Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,6 +25,8 @@
enabled: true
mariadb-galera:
enabled: true
+postgres:
+ enabled: true
aaf:
enabled: true
aai:
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index 382b400..8b436da 100755
--- a/kubernetes/oof/Chart.yaml
+++ b/kubernetes/oof/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Optimization Framework
name: oof
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/Chart.yaml b/kubernetes/oof/components/oof-has/Chart.yaml
index c76136d..65b30e2 100755
--- a/kubernetes/oof/components/oof-has/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Service
name: oof-has
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
index be6442e..b4f8a5f 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Servicei - API
name: oof-has-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml
index de5d276..1569471 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: oof-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
index 63461d9..fb40214 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
@@ -16,7 +16,7 @@
global: # global defaults
nodePortPrefix: 302
image:
- optf_has: onap/optf-has:2.2.0
+ optf_has: onap/optf-has:2.2.1
#################################################################
# secrets metaconfig
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
index 5f88b8e..2b0a244 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Sservice - Controller
name: oof-has-controller
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml
index b87d5ad..a199ea8 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: oof-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
index 9e799e1..aa5b8fc 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
@@ -14,7 +14,7 @@
global:
image:
- optf_has: onap/optf-has:2.2.0
+ optf_has: onap/optf-has:2.2.1
#################################################################
# Secrets metaconfig
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
index 83d99cb..6413a07 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Service - Data Component
name: oof-has-data
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml
index b87d5ad..a199ea8 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: oof-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
index 915ffc0..666818d 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
@@ -14,7 +14,7 @@
global:
image:
- optf_has: onap/optf-has:2.2.0
+ optf_has: onap/optf-has:2.2.1
#################################################################
# secrets metaconfig
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
index a319abd..25bfb24 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Sevice - Reservation Component
name: oof-has-reservation
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml
index b87d5ad..a199ea8 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: oof-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
index 915ffc0..666818d 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
@@ -14,7 +14,7 @@
global:
image:
- optf_has: onap/optf-has:2.2.0
+ optf_has: onap/optf-has:2.2.1
#################################################################
# secrets metaconfig
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
index 8ca0aeb..f60e6ae 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Service - Solver Component
name: oof-has-solver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml
index b87d5ad..a199ea8 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: oof-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
index 915ffc0..666818d 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
@@ -14,7 +14,7 @@
global:
image:
- optf_has: onap/optf-has:2.2.0
+ optf_has: onap/optf-has:2.2.1
#################################################################
# secrets metaconfig
diff --git a/kubernetes/oof/components/oof-has/requirements.yaml b/kubernetes/oof/components/oof-has/requirements.yaml
index 7310aac..33081ea 100755
--- a/kubernetes/oof/components/oof-has/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,40 +16,40 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: music
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: music.enabled
- name: etcd
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: etcd.enabled
- name: etcd-init
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: etcd-init.enabled
- name: oof-has-api
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/oof-has-api'
condition: oof-has-api.enabled
- name: oof-has-controller
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/oof-has-controller'
condition: oof-has-controller.enabled
- name: oof-has-data
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/oof-has-data'
condition: oof-has-data.enabled
- name: oof-has-reservation
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/oof-has-reservation'
condition: oof-has-reservation.enabled
- name: oof-has-solver
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/oof-has-solver'
condition: oof-has-solver.enabled
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/values.yaml b/kubernetes/oof/components/oof-has/values.yaml
index 9a8b605..248d3af 100755
--- a/kubernetes/oof/components/oof-has/values.yaml
+++ b/kubernetes/oof/components/oof-has/values.yaml
@@ -19,7 +19,7 @@
global:
commonConfigPrefix: onap-oof-has
image:
- optf_has: onap/optf-has:2.2.0
+ optf_has: onap/optf-has:2.2.1
persistence:
enabled: true
diff --git a/kubernetes/oof/components/oof-templates/Chart.yaml b/kubernetes/oof/components/oof-templates/Chart.yaml
index 4d7e4a8..5bb0add 100755
--- a/kubernetes/oof/components/oof-templates/Chart.yaml
+++ b/kubernetes/oof/components/oof-templates/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP OOF helm templates
name: oof-templates
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-templates/requirements.yaml b/kubernetes/oof/components/oof-templates/requirements.yaml
index 000e524..73b49e8 100755
--- a/kubernetes/oof/components/oof-templates/requirements.yaml
+++ b/kubernetes/oof/components/oof-templates/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,5 +16,5 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/oof/requirements.yaml b/kubernetes/oof/requirements.yaml
index c17c89f..16ecadb 100755
--- a/kubernetes/oof/requirements.yaml
+++ b/kubernetes/oof/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,18 +16,18 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: oof-has
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/oof-has'
condition: oof-has.enabled
- name: oof-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/oof-templates'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/oof/resources/config/conf/osdf_config.yaml b/kubernetes/oof/resources/config/conf/osdf_config.yaml
index aff6342..441a77a 100755
--- a/kubernetes/oof/resources/config/conf/osdf_config.yaml
+++ b/kubernetes/oof/resources/config/conf/osdf_config.yaml
@@ -43,11 +43,18 @@
secret_domain: {{ .Values.config.secret_domain }}
aaf_ca_certs: {{ .Values.config.aaf_ca_certs }}
+configClientType: {{ .Values.config.configClientType }}
+
# config db api
configDbUrl: {{ .Values.config.configDbUrl }}
configDbGetCellListUrl: {{ .Values.config.configDbGetCellListUrl }}
configDbGetNbrListUrl: {{ .Values.config.configDbGetNbrListUrl }}
+# cps api
+cpsUrl: {{ .Values.config.cps.Url }}
+cpsCellListUrl: {{ .Values.config.cps.cellListUrl }}
+cpsNbrListUrl: {{ .Values.config.cps.nbrListUrl }}
+
# AAI api
aaiUrl: {{ .Values.config.aaiUrl }}
aaiGetLinksUrl: {{ .Values.config.aaiGetLinksUrl }}
diff --git a/kubernetes/oof/resources/config/conf/slicing_config.yaml b/kubernetes/oof/resources/config/conf/slicing_config.yaml
new file mode 100644
index 0000000..e456aec
--- /dev/null
+++ b/kubernetes/oof/resources/config/conf/slicing_config.yaml
@@ -0,0 +1,96 @@
+app_info:
+ NSI:
+ app_name: slice_selection
+ requirements_field: serviceProfile
+ model_info: NSTInfo
+ NSSI:
+ app_name: subnet_selection
+ requirements_field: sliceProfile
+ model_info: NSSTInfo
+
+attribute_mapping:
+ camel_to_snake:
+ maxBandwidth: max_bandwidth
+ jitter: jitter
+ sST: sst
+ latency: latency
+ resourceSharingLevel: resource_sharing_level
+ uEMobilityLevel: ue_mobility_level
+ maxNumberofUEs: max_number_of_ues
+ dLThptPerUE: dl_thpt_per_ue
+ uLThptPerUE: ul_thpt_per_ue
+ sNSSAI: s_nssai
+ pLMNIdList: plmn_id_list
+ activityFactor: activity_factor
+ coverageAreaTAList: coverage_area_ta_list
+ availability: availability
+ cSAvailabilityTarget: cs_availability_target
+ reliability: reliability
+ cSReliabilityMeanTime: cs_reliability_mean_time
+ dLThptPerSlice: dl_thpt_per_slice
+ expDataRateDL: exp_data_rate_dl
+ uLThptPerSlice: ul_thpt_per_slice
+ expDataRateUL: exp_data_rate_ul
+ maxPktSize: max_pkt_size
+ msgSizeByte: msg_size_byte
+ maxNumberofConns: max_number_of_conns
+ maxNumberofPDUSessions: max_number_of_pdu_sessions
+ termDensity: terminal_density
+ survivalTime: survival_time
+ areaTrafficCapDL: area_traffic_cap_dl
+ areaTrafficCapUL: area_traffic_cap_ul
+ overallUserDensity: overall_user_density
+ transferIntervalTarget: transfer_interval_target
+ expDataRate: exp_data_rate
+ security: security
+ maxThroughput: max_throughput
+ sliceProfileId: slice_profile_id
+ snssaiList: s_nssai_list
+ domainType: domain_type
+ logicInterfaceId: logical_interface_id
+ ipAddress: ip_address
+ nextHopInfo: next_hop_info
+ perfReq: perf_req
+
+ snake_to_camel:
+ max_bandwidth: maxBandwidth
+ jitter: jitter
+ sst: sST
+ latency: latency
+ resource_sharing_level: resourceSharingLevel
+ ue_mobility_level: uEMobilityLevel
+ max_number_of_ues: maxNumberofUEs
+ dl_thpt_per_ue: dLThptPerUE
+ ul_thpt_per_ue: uLThptPerUE
+ s_nssai: sNSSAI
+ plmn_id_list: pLMNIdList
+ activity_factor: activityFactor
+ coverage_area_ta_list: coverageAreaTAList
+ availability: availability
+ cs_availability_target: cSAvailabilityTarget
+ reliability: reliability
+ cs_reliability_mean_time: cSReliabilityMeanTime
+ dl_thpt_per_slice: dLThptPerSlice
+ exp_data_rate_dl: expDataRateDL
+ ul_thpt_per_slice: uLThptPerSlice
+ exp_data_rate_ul: expDataRateUL
+ max_pkt_size: maxPktSize
+ msg_size_byte: msgSizeByte
+ max_number_of_conns: maxNumberofConns
+ max_number_of_pdu_sessions: maxNumberofPDUSessions
+ terminal_density: termDensity
+ survival_time: survivalTime
+ area_traffic_cap_dl: areaTrafficCapDL
+ area_traffic_cap_ul: areaTrafficCapUL
+ overall_user_density: overallUserDensity
+ transfer_interval_target: transferIntervalTarget
+ exp_data_rate: expDataRate
+ security: security
+ max_throughput: maxThroughput
+ slice_profile_id: sliceProfileId
+ s_nssai_list: snssaiList
+ domain_type: domainType
+ logical_interface_id: logicInterfaceId
+ ip_address: ipAddress
+ next_hop_info: nextHopInfo
+ perf_req: perfReq
diff --git a/kubernetes/oof/templates/deployment.yaml b/kubernetes/oof/templates/deployment.yaml
index 2b1eeba..6f1022b 100644
--- a/kubernetes/oof/templates/deployment.yaml
+++ b/kubernetes/oof/templates/deployment.yaml
@@ -82,7 +82,7 @@
- |
grep -v '^$' /opt/osdf/osaaf/local/org.onap.oof.crt > /tmp/oof.crt
cat /tmp/oof.crt /opt/app/ssl_cert/intermediate_root_ca.pem /opt/app/ssl_cert/aaf_root_ca.cer >> /opt/osdf/org.onap.oof.crt
- ./osdfapp.sh -x osdfapp.py
+ python osdfapp.py
ports:
- containerPort: {{ .Values.service.internalPort }}
# disable liveness probe when breakpoints set in debugger
@@ -120,6 +120,9 @@
- mountPath: /opt/osdf/config/log.yml
name: {{ include "common.fullname" . }}-config
subPath: log.yml
+ - mountPath: /opt/osdf/config/slicing_config.yaml
+ name: {{ include "common.fullname" . }}-config
+ subPath: slicing_config.yaml
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
@@ -146,6 +149,8 @@
path: common_config.yaml
- key: log.yml
path: log.yml
+ - key: slicing_config.yaml
+ path: slicing_config.yaml
{{ include "oof.certificate.volume" . | indent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index c7400e8..64c3e0a 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -35,7 +35,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/optf-osdf:3.0.4
+image: onap/optf-osdf:3.0.6
pullPolicy: Always
# flag to enable debugging - application support required
@@ -83,10 +83,17 @@
aaf_sms_timeout: 30
secret_domain: osdf
aaf_ca_certs: /opt/app/ssl_cert/aaf_root_ca.cer
+ configClientType: cps
# config db api
configDbUrl: http://configdb:8080
configDbGetCellListUrl: 'api/sdnc-config-db/v3/getCellList'
configDbGetNbrListUrl: 'api/sdnc-config-db/v3/getNbrList'
+ # cps api
+ cps:
+ url: cps-tbdmt:8080/execute
+ cellListUrl: 'ran-network/getCellList'
+ nbrListUrl: 'ran-network/getNbrList'
+
#aai api
aaiUrl: https://aai:8443
aaiGetLinksUrl: /aai/v16/network/logical-links
diff --git a/kubernetes/platform/Chart.yaml b/kubernetes/platform/Chart.yaml
index 56df595..8f8d565 100644
--- a/kubernetes/platform/Chart.yaml
+++ b/kubernetes/platform/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2018 ZTE
# Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
# Modifications Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,4 +18,4 @@
apiVersion: v1
description: ONAP platform components
name: platform
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/platform/components/chartmuseum/Chart.yaml b/kubernetes/platform/components/chartmuseum/Chart.yaml
index 1aa8d92..eba65a2 100644
--- a/kubernetes/platform/components/chartmuseum/Chart.yaml
+++ b/kubernetes/platform/components/chartmuseum/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
apiVersion: v1
description: ONAP Chart Museum
name: chartmuseum
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/platform/components/chartmuseum/requirements.yaml b/kubernetes/platform/components/chartmuseum/requirements.yaml
index 07ac4b4..1847e4e 100644
--- a/kubernetes/platform/components/chartmuseum/requirements.yaml
+++ b/kubernetes/platform/components/chartmuseum/requirements.yaml
@@ -1,5 +1,6 @@
#============LICENSE_START========================================================
# Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
- repository: '@local'
\ No newline at end of file
+ version: ~9.x-0
+ repository: '@local'
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
index 0e6336b..549b1fd 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP CMPv2 certificate external provider for cert-manager
name: cmpv2-cert-provider
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
index f570517..a4b3c3d 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
# 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
@@ -13,8 +14,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/platform/components/oom-cert-service/Chart.yaml b/kubernetes/platform/components/oom-cert-service/Chart.yaml
index d47226d..52f8d37 100644
--- a/kubernetes/platform/components/oom-cert-service/Chart.yaml
+++ b/kubernetes/platform/components/oom-cert-service/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Cert Service
name: oom-cert-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/platform/components/oom-cert-service/requirements.yaml b/kubernetes/platform/components/oom-cert-service/requirements.yaml
index 6177278..6ddec4b 100644
--- a/kubernetes/platform/components/oom-cert-service/requirements.yaml
+++ b/kubernetes/platform/components/oom-cert-service/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: cmpv2Config
- version: ~8.x-0
- repository: '@local'
\ No newline at end of file
+ version: ~9.x-0
+ repository: '@local'
diff --git a/kubernetes/platform/requirements.yaml b/kubernetes/platform/requirements.yaml
index ce33101..96ab5d0 100644
--- a/kubernetes/platform/requirements.yaml
+++ b/kubernetes/platform/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
# Modifications Copyright © 2020 Nokia
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +17,11 @@
dependencies:
- name: oom-cert-service
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/oom-cert-service'
- name: cmpv2-cert-provider
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/cmpv2-cert-provider'
- name: chartmuseum
- version: ~8.x-0
- repository: 'file://components/chartmuseum'
\ No newline at end of file
+ version: ~9.x-0
+ repository: 'file://components/chartmuseum'
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index 26b425f..f983344 100755
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018, 2020 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Policy
name: policy
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
index 6e3d678..6f3e517 100755
--- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Policy APEX PDP
name: policy-apex-pdp
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
index f320b21..9a57a49 100755
--- a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2020 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,14 +20,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml
index a025e7e..1c7fba4 100755
--- a/kubernetes/policy/components/policy-api/Chart.yaml
+++ b/kubernetes/policy/components/policy-api/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Policy Design API
name: policy-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-api/requirements.yaml b/kubernetes/policy/components/policy-api/requirements.yaml
index 2365cd7..09b6249 100755
--- a/kubernetes/policy/components/policy-api/requirements.yaml
+++ b/kubernetes/policy/components/policy-api/requirements.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-be/Chart.yaml b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
index 8ec44e0..9c4f573 100644
--- a/kubernetes/policy/components/policy-clamp-be/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Policy Clamp Backend
name: policy-clamp-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-clamp-be/requirements.yaml b/kubernetes/policy/components/policy-clamp-be/requirements.yaml
index 670f8cb..c72d9fa 100644
--- a/kubernetes/policy/components/policy-clamp-be/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
index 3bdcad6..e880ee3 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Policy Clamp Controlloop K8s Participant
name: policy-clamp-cl-k8s-ppnt
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml
index 7878f91..b4dba11 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index 6904e35..fd6de7e 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -58,4 +58,3 @@
# See springboot documentation.
port: 8083
-
\ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
index 9d7e19d..74cf74f 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
@@ -102,7 +102,7 @@
initialDelaySeconds: 20
periodSeconds: 10
port: http-api
-
+
service:
type: ClusterIP
name: policy-clamp-cl-k8s-ppnt
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
index b7c44d7..bbcdb1f 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Policy Clamp Controlloop Runtime
name: policy-clamp-cl-runtime
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml
index 7878f91..b4dba11 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-fe/Chart.yaml b/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
index 2c0faa9..c511c37 100644
--- a/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Policy Clamp Frontend
name: policy-clamp-fe
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-clamp-fe/requirements.yaml b/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
index 670f8cb..c72d9fa 100644
--- a/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-distribution/Chart.yaml b/kubernetes/policy/components/policy-distribution/Chart.yaml
index f3481e3..b3ee15e 100755
--- a/kubernetes/policy/components/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/components/policy-distribution/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Policy Distribution
name: policy-distribution
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-distribution/requirements.yaml b/kubernetes/policy/components/policy-distribution/requirements.yaml
index db84102..1a3127b 100755
--- a/kubernetes/policy/components/policy-distribution/requirements.yaml
+++ b/kubernetes/policy/components/policy-distribution/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright (C) 2020 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,14 +20,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
index 0000e48..5ed9a70 100755
--- a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018, 2020 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Drools Policy Engine (PDP-D)
name: policy-drools-pdp
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
index 6c540a4..68b10de 100755
--- a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018, 2020 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-gui/Chart.yaml b/kubernetes/policy/components/policy-gui/Chart.yaml
index 58ece99..a407ea9 100644
--- a/kubernetes/policy/components/policy-gui/Chart.yaml
+++ b/kubernetes/policy/components/policy-gui/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Policy GUI
name: policy-gui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-gui/requirements.yaml b/kubernetes/policy/components/policy-gui/requirements.yaml
index c9b17cb..acf19af 100644
--- a/kubernetes/policy/components/policy-gui/requirements.yaml
+++ b/kubernetes/policy/components/policy-gui/requirements.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-nexus/Chart.yaml b/kubernetes/policy/components/policy-nexus/Chart.yaml
index 3e28bae..5f4276b 100755
--- a/kubernetes/policy/components/policy-nexus/Chart.yaml
+++ b/kubernetes/policy/components/policy-nexus/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018-2020 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Policy Nexus
name: policy-nexus
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-nexus/requirements.yaml b/kubernetes/policy/components/policy-nexus/requirements.yaml
index 20cc48f..74c05f4 100755
--- a/kubernetes/policy/components/policy-nexus/requirements.yaml
+++ b/kubernetes/policy/components/policy-nexus/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
index a3b3f18..8f02c83 100755
--- a/kubernetes/policy/components/policy-pap/Chart.yaml
+++ b/kubernetes/policy/components/policy-pap/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
# Modified Copyright (C) 2020 AT&T Intellectual Property.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,4 +21,4 @@
apiVersion: v1
description: ONAP Policy Administration (PAP)
name: policy-pap
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-pap/requirements.yaml b/kubernetes/policy/components/policy-pap/requirements.yaml
index 18de3a6..c146e3e 100755
--- a/kubernetes/policy/components/policy-pap/requirements.yaml
+++ b/kubernetes/policy/components/policy-pap/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
# Modified Copyright (C) 2020 AT&T Intellectual Property.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,14 +20,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
index cf07d84..f043939 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Policy XACML PDP (PDP-X)
name: policy-xacml-pdp
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
index 2365cd7..09b6249 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/policy/requirements.yaml b/kubernetes/policy/requirements.yaml
index 0ba1535..65ca87b 100755
--- a/kubernetes/policy/requirements.yaml
+++ b/kubernetes/policy/requirements.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018, 2020 AT&T
# Modifications Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,62 +17,62 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: policy-nexus
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-nexus'
condition: policy-nexus.enabled
- name: policy-api
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-api'
condition: policy-api.enabled
- name: policy-pap
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-pap'
condition: policy-pap.enabled
- name: policy-xacml-pdp
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-xacml-pdp'
condition: policy-xacml-pdp.enabled
- name: policy-apex-pdp
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-apex-pdp'
condition: policy-apex-pdp.enabled
- name: policy-drools-pdp
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-drools-pdp'
condition: policy-drools-pdp.enabled
- name: policy-distribution
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-distribution'
condition: policy-distribution.enabled
- name: policy-clamp-be
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-clamp-be'
condition: policy-clamp-be.enabled
- name: policy-clamp-fe
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-clamp-fe'
condition: policy-clamp-fe.enabled
- name: policy-clamp-cl-k8s-ppnt
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-clamp-cl-k8s-ppnt'
condition: policy-clamp-cl-k8s-ppnt.enabled
- name: policy-clamp-cl-runtime
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-clamp-cl-runtime'
condition: policy-clamp-cl-runtime.enabled
- name: policy-gui
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/policy-gui'
condition: policy-gui.enabled
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/portal/Chart.yaml b/kubernetes/portal/Chart.yaml
index fb7d527..16edb6d 100644
--- a/kubernetes/portal/Chart.yaml
+++ b/kubernetes/portal/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Web Portal
name: portal
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-app/Chart.yaml b/kubernetes/portal/components/portal-app/Chart.yaml
index 83e9847..79449df 100644
--- a/kubernetes/portal/components/portal-app/Chart.yaml
+++ b/kubernetes/portal/components/portal-app/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Portal application
name: portal-app
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-app/requirements.yaml b/kubernetes/portal/components/portal-app/requirements.yaml
index d49317d..8d18e7f 100644
--- a/kubernetes/portal/components/portal-app/requirements.yaml
+++ b/kubernetes/portal/components/portal-app/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/portal/components/portal-cassandra/Chart.yaml b/kubernetes/portal/components/portal-cassandra/Chart.yaml
index f15479b..0e8762b 100644
--- a/kubernetes/portal/components/portal-cassandra/Chart.yaml
+++ b/kubernetes/portal/components/portal-cassandra/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: Portal cassandra
name: portal-cassandra
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-cassandra/requirements.yaml b/kubernetes/portal/components/portal-cassandra/requirements.yaml
index 1139b8e..6e32e22 100644
--- a/kubernetes/portal/components/portal-cassandra/requirements.yaml
+++ b/kubernetes/portal/components/portal-cassandra/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/Chart.yaml b/kubernetes/portal/components/portal-mariadb/Chart.yaml
index 5883b99..a15f9e7 100644
--- a/kubernetes/portal/components/portal-mariadb/Chart.yaml
+++ b/kubernetes/portal/components/portal-mariadb/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: MariaDB Service
name: portal-mariadb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-mariadb/requirements.yaml b/kubernetes/portal/components/portal-mariadb/requirements.yaml
index 1139b8e..6e32e22 100644
--- a/kubernetes/portal/components/portal-mariadb/requirements.yaml
+++ b/kubernetes/portal/components/portal-mariadb/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/portal/components/portal-sdk/Chart.yaml b/kubernetes/portal/components/portal-sdk/Chart.yaml
index 11b835d..1119dac 100644
--- a/kubernetes/portal/components/portal-sdk/Chart.yaml
+++ b/kubernetes/portal/components/portal-sdk/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: Portal software development kit
name: portal-sdk
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-sdk/requirements.yaml b/kubernetes/portal/components/portal-sdk/requirements.yaml
index d49317d..8d18e7f 100644
--- a/kubernetes/portal/components/portal-sdk/requirements.yaml
+++ b/kubernetes/portal/components/portal-sdk/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/portal/components/portal-widget/Chart.yaml b/kubernetes/portal/components/portal-widget/Chart.yaml
index aaac74f..7b0673e 100644
--- a/kubernetes/portal/components/portal-widget/Chart.yaml
+++ b/kubernetes/portal/components/portal-widget/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: Portal widgets micro service application
name: portal-widget
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-widget/requirements.yaml b/kubernetes/portal/components/portal-widget/requirements.yaml
index 1139b8e..6e32e22 100644
--- a/kubernetes/portal/components/portal-widget/requirements.yaml
+++ b/kubernetes/portal/components/portal-widget/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml
index 4bca811..2be01cf 100644
--- a/kubernetes/portal/requirements.yaml
+++ b/kubernetes/portal/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,20 +16,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: portal-app
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/portal-app'
- name: portal-cassandra
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/portal-cassandra'
- name: portal-mariadb
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/portal-mariadb'
- name: portal-sdk
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/portal-sdk'
- name: portal-widget
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/portal-widget'
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index b456b5b..5e83d1e 100644
--- a/kubernetes/robot/Chart.yaml
+++ b/kubernetes/robot/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: A helm Chart for kubernetes-ONAP Robot
name: robot
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/robot/requirements.yaml b/kubernetes/robot/requirements.yaml
index 76fdb3f..9f1af30 100644
--- a/kubernetes/robot/requirements.yaml
+++ b/kubernetes/robot/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index b43bcd9..1b606b8 100644
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, AT&T, Bell Canada
-# Modifications Copyright © 2018 ZTE
+# Modifications Copyright © 2018 ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: Service Design and Creation Umbrella Helm charts
name: sdc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-be/Chart.yaml b/kubernetes/sdc/components/sdc-be/Chart.yaml
index 6b97c3b..03c6378 100644
--- a/kubernetes/sdc/components/sdc-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-be/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Backend API
name: sdc-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-be/requirements.yaml b/kubernetes/sdc/components/sdc-be/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-be/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2020 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index cdddad7..a021f72 100644
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Cassandra
name: sdc-cs
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-cs/requirements.yaml b/kubernetes/sdc/components/sdc-cs/requirements.yaml
index 7d9ea04..30d0a22 100644
--- a/kubernetes/sdc/components/sdc-cs/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-cs/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2020 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-fe/Chart.yaml b/kubernetes/sdc/components/sdc-fe/Chart.yaml
index 2291ff4..1ea4e36 100644
--- a/kubernetes/sdc/components/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-fe/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Front End
name: sdc-fe
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-fe/requirements.yaml b/kubernetes/sdc/components/sdc-fe/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-fe/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-fe/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2020 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
index 5af3bf7..b8611a5 100644
--- a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
@@ -1,5 +1,6 @@
# ===========LICENSE_START========================================================
# Copyright (c) 2021 Nokia. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,4 +18,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Helm Validator
name: sdc-helm-validator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml b/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml
index 8e1160a..a935025 100644
--- a/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml
@@ -1,5 +1,6 @@
# ===========LICENSE_START========================================================
# Copyright (c) 2021 Nokia. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,8 @@
dependencies:
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
index 20a8fa4..e6090fc 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Onboarding API
name: sdc-onboarding-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2020 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
index 93bbf23..9fc2249 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Workflow Designer backend
name: sdc-wfd-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2020 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
index ae14eb9..84afef0 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Workflow Designer frontend
name: sdc-wfd-fe
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2020 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
dependencies:
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdc/requirements.yaml b/kubernetes/sdc/requirements.yaml
index 1f9b2d1..b9597c3 100644
--- a/kubernetes/sdc/requirements.yaml
+++ b/kubernetes/sdc/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,26 +16,26 @@
dependencies:
- name: sdc-be
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdc-be'
- name: sdc-cs
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdc-cs'
- name: sdc-fe
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdc-fe'
- name: sdc-onboarding-be
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdc-onboarding-be'
- name: sdc-wfd-be
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdc-wfd-be'
condition: sdc-wfd.enabled
- name: sdc-wfd-fe
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdc-wfd-fe'
condition: sdc-wfd.enabled
- name: sdc-helm-validator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdc-helm-validator'
condition: sdcHelmValidator.enabled
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index 0d11afc..c75a17c 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: SDN Controller
name: sdnc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
index 9c35682..29161ae 100644
--- a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: SDNC DMaaP Listener
name: dmaap-listener
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
index 2c0b108..6056f41 100644
--- a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
index 4009467..02447f1 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: SDN-C Ansible Server
name: sdnc-ansible-server
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
index 2c0b108..6056f41 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
index 6c81785..f49cbbe 100644
--- a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP SDNC Policy Driven Ownership Management
name: sdnc-prom
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
index 1cc295e..0a47ac4 100644
--- a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-web/Chart.yaml b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
index 3429793..1482c3b 100644
--- a/kubernetes/sdnc/components/sdnc-web/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 highstreet technologies GmbH
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: SDN-C Web Server
name: sdnc-web
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/sdnc-web/requirements.yaml b/kubernetes/sdnc/components/sdnc-web/requirements.yaml
index 3d79681..96588e3 100644
--- a/kubernetes/sdnc/components/sdnc-web/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 highstreet technologies GmbH
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/ueb-listener/Chart.yaml b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
index ae53f9c..8640743 100644
--- a/kubernetes/sdnc/components/ueb-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: SDNC UEB Listener
name: ueb-listener
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/ueb-listener/requirements.yaml b/kubernetes/sdnc/components/ueb-listener/requirements.yaml
index 2c0b108..6056f41 100644
--- a/kubernetes/sdnc/components/ueb-listener/requirements.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml
index f5f6226..58c8e60 100644
--- a/kubernetes/sdnc/requirements.yaml
+++ b/kubernetes/sdnc/requirements.yaml
@@ -2,6 +2,7 @@
# Copyright © 2017 Amdocs, Bell Canada,
# Copyright © 2020 highstreet technologies GmbH
# Copyright © 2021 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,57 +17,57 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: logConfiguration
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: network-name-gen
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: network-name-gen.enabled
- name: dgbuilder
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: dgbuilder.enabled
- name: sdnc-prom
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: config.geoEnabled
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: elasticsearch
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: config.sdnr.enabled
# conditions for sdnc-subcharts
- name: dmaap-listener
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/dmaap-listener/'
condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
- name: ueb-listener
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/ueb-listener/'
condition: sdnc.ueb-listener.enabled,ueb-listener.enabled
- name: sdnc-ansible-server
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdnc-ansible-server/'
condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled
- name: sdnc-web
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/sdnc-web/'
condition: sdnc.sdnc-web.enabled,sdnc-web.enabled
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml
index ae5f164..4bbacab 100644
--- a/kubernetes/sniro-emulator/Chart.yaml
+++ b/kubernetes/sniro-emulator/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Mock Sniro Emulator
name: sniro-emulator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml
index 76fdb3f..9f1af30 100644
--- a/kubernetes/sniro-emulator/requirements.yaml
+++ b/kubernetes/sniro-emulator/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml
index 0aacaf2..94f916f 100755
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: ONAP Service Orchestrator
name: so
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-admin-cockpit/Chart.yaml b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
index 2bebdfd..79c5bb8 100644
--- a/kubernetes/so/components/so-admin-cockpit/Chart.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
+# Modifications Copyright © 2021 Orange
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
apiVersion: v1
description: A Helm chart for ONAP Service Orchestration Monitoring
name: so-admin-cockpit
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-admin-cockpit/requirements.yaml b/kubernetes/so/components/so-admin-cockpit/requirements.yaml
index 7245266..3120c0f 100755
--- a/kubernetes/so/components/so-admin-cockpit/requirements.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications © 2020 Nokia
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
index d12e318..944b7de 100644
--- a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: A Helm chart for so appc orchestrator
name: so-appc-orchestrator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
index f8c29f8..19d4cc7 100755
--- a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,18 +14,17 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
-
diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
index 093ecb1..3b439b6 100755
--- a/kubernetes/so/components/so-bpmn-infra/Chart.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
appVersion: "1.0"
description: A Helm chart for SO Bpmn Infra
name: so-bpmn-infra
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-bpmn-infra/requirements.yaml b/kubernetes/so/components/so-bpmn-infra/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-bpmn-infra/requirements.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index c64e105..360936d 100755
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -34,6 +34,10 @@
job-execution:
max-pool-size: 30
core-pool-size: 3
+ generic-properties:
+ properties:
+ sunday-history-cleanup-batch-window-start-time: {{ quote .Values.camunda.sundayCleanupWindowStartTime }}
+ sunday-history-cleanup-batch-window-end-time: {{ quote .Values.camunda.sundayCleanupWindowEndTime }}
entitymanager:
packagesToScan: com
pnf:
@@ -113,9 +117,6 @@
timeout: PT5M
callback:
endpoint: http://so-oof-adapter.{{ include "common.namespace" . }}:8090/so/adapters/oof/callback/v1
- bpmn:
- process:
- historyTimeToLive: '30'
callbackRetryAttempts: '5'
catalog:
db:
@@ -285,6 +286,7 @@
naming:
endpoint: http://naming.demo.onap.com:8081/web/service/v1/genNetworkElementName
auth: Basic bTA0NzY4QG5vbi1wcm9kLm1zby5lY29tcC5hdHQuY29tOkF0dG0wNDc2OExpZmUhQA==
+ bpmn-history-ttl: {{ .Values.bpmn.historyTTL }}
policy:
auth: Basic dGVzdHBkcDphbHBoYTEyMw==
default:
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 405017c..92c0a61 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -63,9 +63,16 @@
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/bpmn-infra:1.9.0
+image: onap/so/bpmn-infra:1.9.2
pullPolicy: Always
+bpmn:
+ historyTTL: 14
+
+camunda:
+ sundayCleanupWindowStartTime: "04:00"
+ sundayCleanupWindowEndTime: "10:00"
+
db:
userName: so_user
userPassword: so_User123
diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
index f169946..ed640b1 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: A Helm chart for so-catalog-db-adapter
name: so-catalog-db-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml b/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index c3b6151..57c4902 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -62,7 +62,7 @@
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/catalog-db-adapter:1.9.0
+image: onap/so/catalog-db-adapter:1.9.2
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-cnf-adapter/Chart.yaml b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
index b61580a..79028c0 100755
--- a/kubernetes/so/components/so-cnf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Huawei Technologies Co., Ltd.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
appVersion: "1.7.1"
description: A Helm chart for Kubernetes
name: so-cnf-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-cnf-adapter/requirements.yaml b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
index 6f2b29e..17634f3 100755
--- a/kubernetes/so/components/so-cnf-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
index 0a086b5..c321949 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Nordix Foundation
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP SO ETSI NFVO NS LCM
name: so-etsi-nfvo-ns-lcm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
index 421fe7e..19d4cc7 100755
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
index 68519b2..f3435e8 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2019 Nordix Foundation
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: ONAP SO ETSI SOL003 Adapter
name: so-etsi-sol003-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
index 421fe7e..19d4cc7 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
index b178ab5..6c9d1f3 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-etsi-sol005-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-mariadb/Chart.yaml b/kubernetes/so/components/so-mariadb/Chart.yaml
index a39c515..4cc9ff6 100755
--- a/kubernetes/so/components/so-mariadb/Chart.yaml
+++ b/kubernetes/so/components/so-mariadb/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: MariaDB Service
name: so-mariadb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-mariadb/requirements.yaml b/kubernetes/so/components/so-mariadb/requirements.yaml
index b182a70..f5c8b4f 100755
--- a/kubernetes/so/components/so-mariadb/requirements.yaml
+++ b/kubernetes/so/components/so-mariadb/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
index 948c8e2..42173b3 100755
--- a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Huawei Technologies Co., Ltd.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-nssmf-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-oof-adapter/Chart.yaml b/kubernetes/so/components/so-oof-adapter/Chart.yaml
index fbdbd3b..807d844 100755
--- a/kubernetes/so/components/so-oof-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-oof-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-oof-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-oof-adapter/requirements.yaml b/kubernetes/so/components/so-oof-adapter/requirements.yaml
index 4d6d760..dcff74b 100644
--- a/kubernetes/so/components/so-oof-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-oof-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
index 88d9cfb..46fc422 100755
--- a/kubernetes/so/components/so-openstack-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-openstack-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-openstack-adapter/requirements.yaml b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-openstack-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 82b4061..2ac8295 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -58,7 +58,7 @@
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/openstack-adapter:1.9.0
+image: onap/so/openstack-adapter:1.9.2
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
index 0798656..c8d573e 100755
--- a/kubernetes/so/components/so-request-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: A Helm chart for request-db-adapter
name: so-request-db-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-request-db-adapter/requirements.yaml b/kubernetes/so/components/so-request-db-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-request-db-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index 9461974..d49210f 100755
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -58,7 +58,7 @@
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/request-db-adapter:1.9.0
+image: onap/so/request-db-adapter:1.9.2
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml
index fe17976..82b16fb 100755
--- a/kubernetes/so/components/so-sdc-controller/Chart.yaml
+++ b/kubernetes/so/components/so-sdc-controller/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-sdc-controller
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-sdc-controller/requirements.yaml b/kubernetes/so/components/so-sdc-controller/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-sdc-controller/requirements.yaml
+++ b/kubernetes/so/components/so-sdc-controller/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index 9151468..6f98856 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -58,7 +58,7 @@
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/sdc-controller:1.9.0
+image: onap/so/sdc-controller:1.9.2
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
index 069a0b0..e48406d 100755
--- a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-sdnc-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
index 421fe7e..19d4cc7 100755
--- a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index b5352b0..6cb019c 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -72,7 +72,7 @@
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/sdnc-adapter:1.9.0
+image: onap/so/sdnc-adapter:1.9.2
pullPolicy: Always
org:
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
index fb22321..5e7f635 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020 Samsung
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP SO VE VNFM Adapter (SOL002)
name: so-ve-vnfm-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/components/soHelpers/Chart.yaml b/kubernetes/so/components/soHelpers/Chart.yaml
index d3cbc8e..3eb4a04 100755
--- a/kubernetes/so/components/soHelpers/Chart.yaml
+++ b/kubernetes/so/components/soHelpers/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
apiVersion: v1
description: A Helm chart for SO helpers
name: soHelpers
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/soHelpers/requirements.yaml b/kubernetes/so/components/soHelpers/requirements.yaml
index eb8b455..8bda2a1 100755
--- a/kubernetes/so/components/soHelpers/requirements.yaml
+++ b/kubernetes/so/components/soHelpers/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml
index af95ab8..4c19862 100755
--- a/kubernetes/so/requirements.yaml
+++ b/kubernetes/so/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,87 +14,87 @@
# limitations under the License.
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: soHelpers
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/soHelpers'
- name: so-admin-cockpit
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-admin-cockpit'
condition: so-admin-cockpit.enabled
- name: so-appc-orchestrator
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-appc-orchestrator'
condition: so-appc-orchestrator.enabled
- name: so-bpmn-infra
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-bpmn-infra'
- name: so-catalog-db-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-catalog-db-adapter'
condition: so-catalog-db-adapter.enabled
- name: so-cnf-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: "file://components/so-cnf-adapter"
condition: so-cnf-adapter.enabled
- name: so-etsi-nfvo-ns-lcm
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-etsi-nfvo-ns-lcm'
condition: so-etsi-nfvo-ns-lcm.enabled
- name: so-etsi-sol003-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-etsi-sol003-adapter'
condition: so-etsi-sol003-adapter.enabled
- name: so-mariadb
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-mariadb'
- name: so-nssmf-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-nssmf-adapter'
condition: so-nssmf-adapter.enabled
- name: so-oof-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-oof-adapter'
condition: so-oof-adapter.enabled
- name: so-openstack-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-openstack-adapter'
condition: so-openstack-adapter.enabled
- name: so-request-db-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-request-db-adapter'
- name: so-sdc-controller
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-sdc-controller'
- name: so-sdnc-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-sdnc-adapter'
condition: so-sdnc-adapter.enabled
- name: so-ve-vnfm-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-ve-vnfm-adapter'
condition: so-ve-vnfm-adapter.enabled
- name: so-etsi-sol005-adapter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/so-etsi-sol005-adapter'
condition: so-etsi-sol005-adapter.enabled
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 0644159..988b8ef 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -181,7 +181,7 @@
userName: so_user
adminName: so_admin
-image: onap/so/api-handler-infra:1.9.0
+image: onap/so/api-handler-infra:1.9.2
server:
aaf:
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index fe69cd4..cd82001 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP uui
name: uui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/uui/components/uui-server/Chart.yaml b/kubernetes/uui/components/uui-server/Chart.yaml
index f98f231..493ff18 100644
--- a/kubernetes/uui/components/uui-server/Chart.yaml
+++ b/kubernetes/uui/components/uui-server/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP uui server
name: uui-server
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 980e462..6017f26 100644
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -25,7 +25,7 @@
# application image
repository: nexus3.onap.org:10001
-image: onap/usecase-ui-server:4.0.3
+image: onap/usecase-ui-server:4.0.5
pullPolicy: Always
# application configuration
diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
index a64f0d3..b982291 100644
--- a/kubernetes/uui/requirements.yaml
+++ b/kubernetes/uui/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: uui-server
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/uui-server'
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index ddac84e..32b8449 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -24,7 +24,7 @@
flavor: small
# application image
-image: onap/usecase-ui:4.0.3
+image: onap/usecase-ui:4.0.5
pullPolicy: Always
# application configuration
diff --git a/kubernetes/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml
index 443d00e..d1df26b 100644
--- a/kubernetes/vfc/Chart.yaml
+++ b/kubernetes/vfc/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Virtual Function Controller (VF-C)
name: vfc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
index 67461bf..40e3402 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VFC - Generic VNFM Driver
name: vfc-generic-vnfm-driver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
index 690b0c4..305c2e0 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VFC - Huawei VNFM Driver
name: vfc-huawei-vnfm-driver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
index b4fdc3e..d10ff27 100644
--- a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VFC - NS Life Cycle Management
name: vfc-nslcm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-redis/Chart.yaml b/kubernetes/vfc/components/vfc-redis/Chart.yaml
index 7155cd7..6334729 100644
--- a/kubernetes/vfc/components/vfc-redis/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-redis/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (C) 2018 Verizon. All Rights Reserved.
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VFC - REDIS
name: vfc-redis
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-redis/requirements.yaml b/kubernetes/vfc/components/vfc-redis/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-redis/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-redis/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
index ddc8a63..d1be70e 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VFC - VNF Life Cycle Management
name: vfc-vnflcm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
index 09136b1..e5d4d1e 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VFC - VNF Manager
name: vfc-vnfmgr
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
index 7799bc5..61e9d66 100644
--- a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VFC - VNF Resource Manager
name: vfc-vnfres
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
index 741fb0c..ca717c2 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VFC - ZTE VNFM Driver
name: vfc-zte-vnfm-driver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml
index 7f65b02..e404715 100644
--- a/kubernetes/vfc/requirements.yaml
+++ b/kubernetes/vfc/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,44 +15,44 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: vfc-generic-vnfm-driver
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/vfc-generic-vnfm-driver'
condition: vfc-generic-vnfm-driver.enabled
- name: vfc-huawei-vnfm-driver
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/vfc-huawei-vnfm-driver'
condition: vfc-huawei-vnfm-driver.enabled
- name: vfc-nslcm
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/vfc-nslcm'
condition: vfc-nslcm.enabled
- name: vfc-redis
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/vfc-redis'
condition: vfc-redis.enabled
- name: vfc-vnflcm
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/vfc-vnflcm'
condition: vfc-vnflcm.enabled
- name: vfc-vnfmgr
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/vfc-vnfmgr'
condition: vfc-vnfmgr.enabled
- name: vfc-vnfres
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/vfc-vnfres'
condition: vfc-vnfres.enabled
- name: vfc-zte-vnfm-driver
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/vfc-zte-vnfm-driver'
condition: vfc-zte-vnfm-driver.enabled
diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml
index f97c844..4791266 100644
--- a/kubernetes/vid/Chart.yaml
+++ b/kubernetes/vid/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Virtual Infrastructure Deployment
name: vid
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
index f26aee0..53d8d69 100644
--- a/kubernetes/vid/requirements.yaml
+++ b/kubernetes/vid/requirements.yaml
@@ -15,22 +15,22 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: mariadb-galera
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml
index 0b6bfd9..e73fb16 100644
--- a/kubernetes/vnfsdk/Chart.yaml
+++ b/kubernetes/vnfsdk/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP VNF SDK
name: vnfsdk
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vnfsdk/requirements.yaml b/kubernetes/vnfsdk/requirements.yaml
index 89ddccd..bcdbe2f 100644
--- a/kubernetes/vnfsdk/requirements.yaml
+++ b/kubernetes/vnfsdk/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..f3d82da
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,11 @@
+Sphinx
+doc8
+docutils
+six
+lfdocs-conf
+sphinxcontrib-redoc
+sphinxcontrib-spelling
+PyEnchant
+pylint
+autopep8
+gitlint
diff --git a/tox.ini b/tox.ini
index efe3b38..bbd00f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,27 +12,35 @@
ignore-path-errors=docs/helm-search.txt;D001
[testenv:doc8]
-deps = -rdocs/requirements-docs.txt
- doc8
+deps =
+ -r{toxinidir}/requirements.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
commands =
- doc8 docs/
[testenv:docs]
-deps = -rdocs/requirements-docs.txt
+deps =
+ -r{toxinidir}/requirements.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
commands =
sphinx-build -q -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
[testenv:docs-linkcheck]
-deps = -rdocs/requirements-docs.txt
+deps =
+ -r{toxinidir}/requirements.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
commands = sphinx-build -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
[testenv:spelling]
#basepython = python3
whitelist_externals = wget
deps =
- -rdocs/requirements-docs.txt
- sphinxcontrib-spelling
- PyEnchant
+ -r{toxinidir}/requirements.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
changedir={toxinidir}/docs
commands =
wget -nv https://git.onap.org/doc/plain/docs/spelling_wordlist.txt -O spelling_wordlist.txt
@@ -41,8 +49,9 @@
[testenv:gitlint]
basepython = python3
deps =
- gitlint
-
+ -r{toxinidir}/requirements.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
commands =
gitlint
@@ -58,12 +67,18 @@
find . -not -path '*/\.*' -name *.sh -exec checkbashisms \{\} +
[testenv:autopep8]
-deps = autopep8
+deps =
+ -r{toxinidir}/requirements.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
commands =
autopep8 --max-line-length 120 --in-place --recursive kubernetes/ TOSCA/ docs/
[testenv:pylint]
-deps = pylint
+deps =
+ -r{toxinidir}/requirements.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
whitelist_externals = find
commands =
find kubernetes/ TOSCA/ docs/ -name *.py -exec pylint --max-line-length=120 --disable=missing-docstring --method-rgx="(([a-z_][a-zA-Z0-9_]{2,})|(_[a-z0-9_]*)|(__[a-zA-Z][a-zA-Z0-9_]+__))$" --variable-rgx="[a-zA-Z_][a-zA-Z0-9_]{1,30}$" --reports=y --score=y --output-format=colorized \{\} +