summaryrefslogtreecommitdiffstats
path: root/kubernetes/oof
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/oof')
-rwxr-xr-xkubernetes/oof/Chart.yaml3
-rwxr-xr-xkubernetes/oof/components/oof-has/Chart.yaml3
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml3
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml9
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-api/values.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml3
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml7
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml3
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml7
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-data/values.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml3
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml7
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml3
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml7
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/requirements.yaml21
-rwxr-xr-xkubernetes/oof/components/oof-has/values.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-templates/Chart.yaml3
-rwxr-xr-xkubernetes/oof/components/oof-templates/requirements.yaml3
-rwxr-xr-xkubernetes/oof/requirements.yaml11
-rwxr-xr-xkubernetes/oof/resources/config/conf/osdf_config.yaml7
-rw-r--r--kubernetes/oof/resources/config/conf/slicing_config.yaml96
-rw-r--r--kubernetes/oof/templates/deployment.yaml7
-rw-r--r--kubernetes/oof/values.yaml9
26 files changed, 179 insertions, 48 deletions
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index 382b40047b..8b436dac7d 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 c76136df86..65b30e2a15 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 be6442ef3b..b4f8a5f844 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 de5d276d4a..15694713a0 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 63461d9c83..fb402143c6 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 5f88b8ec8a..2b0a2447c1 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 b87d5add28..a199ea899d 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 9e799e1045..aa5b8fca2e 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 83d99cb76f..6413a0724e 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 b87d5add28..a199ea899d 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 915ffc019f..666818da73 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 a319abd6dc..25bfb24740 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 b87d5add28..a199ea899d 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 915ffc019f..666818da73 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 8ca0aeb6bd..f60e6ae79e 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 b87d5add28..a199ea899d 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 915ffc019f..666818da73 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 7310aac8d0..33081ea3f6 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 9a8b60574e..248d3afd57 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 4d7e4a8288..5bb0add9a9 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 000e5249cb..73b49e83d2 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 c17c89f4d0..16ecadb956 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 aff63428eb..441a77ab5a 100755
--- a/kubernetes/oof/resources/config/conf/osdf_config.yaml
+++ b/kubernetes/oof/resources/config/conf/osdf_config.yaml
@@ -43,11 +43,18 @@ aaf_sms_timeout: {{ .Values.config.aaf_sms_timeout }}
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 0000000000..e456aeccdf
--- /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 2b1eeba747..6f1022ba63 100644
--- a/kubernetes/oof/templates/deployment.yaml
+++ b/kubernetes/oof/templates/deployment.yaml
@@ -82,7 +82,7 @@ spec:
- |
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 @@ spec:
- 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 @@ spec:
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 c7400e860f..64c3e0ad29 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -35,7 +35,7 @@ secrets:
# 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 @@ config:
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