[AAI] Templatize MSB services
Instead of "hardcoding" all services, let's generate them with two
values and shrink a little bit template.
It also simplify the reading of the template.
Issue-ID: OOM-2664
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I2a5f181fac93f34e074998aeaf82489f8305de1f
diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index 84d3df3..a67d7bf 100644
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -2,6 +2,7 @@
# Copyright (c) 2017 Amdocs, Bell Canada
# Modifications Copyright (c) 2018 AT&T
# Modifications Copyright (c) 2020 Nokia
+# 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.
@@ -39,1142 +40,36 @@
name: {{ include "common.name" . }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+ {{- if .Values.global.msbEnabled }}
+ {{ $values := .Values }}
msb.onap.org/service-info: '[
+ {{- range $api_endpoint := $values.aai_enpoints -}}
+ {{- range $api_version := $values.api_list }}
{
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v11",
- "url": "/aai/v11/cloud-infrastructure",
+ "serviceName": "_{{ $api_endpoint.name }}",
+ "version": "v{{ $api_version }}",
+ "url": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}",
"protocol": "REST",
"port": "8447",
"enable_ssl": true,
"lb_policy":"ip_hash",
"visualRange": "1",
- "path": "/aai/v11/cloud-infrastructure"
+ "path": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}"
},
{
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v12",
- "url": "/aai/v12/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/cloud-infrastructure"
- },
- {
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v13",
- "url": "/aai/v13/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/cloud-infrastructure"
- },
- {
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v14",
- "url": "/aai/v14/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/cloud-infrastructure"
- },
- {
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v15",
- "url": "/aai/v15/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/cloud-infrastructure"
- },
- {
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v16",
- "url": "/aai/v16/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/cloud-infrastructure"
- },
- {
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v17",
- "url": "/aai/v17/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/cloud-infrastructure"
- },
- {
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v18",
- "url": "/aai/v18/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/cloud-infrastructure"
- },
- {
- "serviceName": "_aai-cloudInfrastructure",
- "version": "v19",
- "url": "/aai/v19/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/cloud-infrastructure"
- },
- {
- "serviceName": "_aai-business",
- "version": "v11",
- "url": "/aai/v11/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v11/business"
- },
- {
- "serviceName": "_aai-business",
- "version": "v12",
- "url": "/aai/v12/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/business"
- },
- {
- "serviceName": "_aai-business",
- "version": "v13",
- "url": "/aai/v13/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/business"
- },
- {
- "serviceName": "_aai-business",
- "version": "v14",
- "url": "/aai/v14/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/business"
- },
- {
- "serviceName": "_aai-business",
- "version": "v15",
- "url": "/aai/v15/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/business"
- },
- {
- "serviceName": "_aai-business",
- "version": "v16",
- "url": "/aai/v16/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/business"
- },
- {
- "serviceName": "_aai-business",
- "version": "v17",
- "url": "/aai/v17/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/business"
- },
- {
- "serviceName": "_aai-business",
- "version": "v18",
- "url": "/aai/v18/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/business"
- },
- {
- "serviceName": "_aai-business",
- "version": "v19",
- "url": "/aai/v19/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/business"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v11",
- "url": "/aai/v11/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v11/actions"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v12",
- "url": "/aai/v12/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/actions"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v13",
- "url": "/aai/v13/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/actions"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v14",
- "url": "/aai/v14/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/actions"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v15",
- "url": "/aai/v15/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/actions"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v16",
- "url": "/aai/v16/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/actions"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v17",
- "url": "/aai/v17/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/actions"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v18",
- "url": "/aai/v18/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/actions"
- },
- {
- "serviceName": "_aai-actions",
- "version": "v19",
- "url": "/aai/v19/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/actions"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v11",
- "url": "/aai/v11/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v11/service-design-and-creation"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v12",
- "url": "/aai/v12/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/service-design-and-creation"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v13",
- "url": "/aai/v13/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/service-design-and-creation"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v14",
- "url": "/aai/v14/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/service-design-and-creation"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v15",
- "url": "/aai/v15/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/service-design-and-creation"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v16",
- "url": "/aai/v16/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/service-design-and-creation"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v17",
- "url": "/aai/v17/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/service-design-and-creation"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v18",
- "url": "/aai/v18/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/service-design-and-creation"
- },
- {
- "serviceName": "_aai-service-design-and-creation",
- "version": "v19",
- "url": "/aai/v19/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/service-design-and-creation"
- },
- {
- "serviceName": "_aai-network",
- "version": "v11",
- "url": "/aai/v11/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v11/network"
- },
- {
- "serviceName": "_aai-network",
- "version": "v12",
- "url": "/aai/v12/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/network"
- },
- {
- "serviceName": "_aai-network",
- "version": "v13",
- "url": "/aai/v13/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/network"
- },
- {
- "serviceName": "_aai-network",
- "version": "v14",
- "url": "/aai/v14/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/network"
- },
- {
- "serviceName": "_aai-network",
- "version": "v15",
- "url": "/aai/v15/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/network"
- },
- {
- "serviceName": "_aai-network",
- "version": "v16",
- "url": "/aai/v16/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/network"
- },
- {
- "serviceName": "_aai-network",
- "version": "v17",
- "url": "/aai/v17/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/network"
- },
- {
- "serviceName": "_aai-network",
- "version": "v18",
- "url": "/aai/v18/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/network"
- },
- {
- "serviceName": "_aai-network",
- "version": "v19",
- "url": "/aai/v19/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/network"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v11",
- "url": "/aai/v11/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v11/external-system"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v12",
- "url": "/aai/v12/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/external-system"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v13",
- "url": "/aai/v13/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/external-system"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v14",
- "url": "/aai/v14/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/external-system"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v15",
- "url": "/aai/v15/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/external-system"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v16",
- "url": "/aai/v16/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/external-system"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v17",
- "url": "/aai/v17/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/external-system"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v18",
- "url": "/aai/v18/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/external-system"
- },
- {
- "serviceName": "_aai-externalSystem",
- "version": "v19",
- "url": "/aai/v19/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/external-system"
- },
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v11",
- "url": "/aai/v11/cloud-infrastructure",
+ "serviceName": "{{ $api_endpoint.name }}",
+ "version": "v{{ $api_version }}",
+ "url": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}",
"protocol": "REST",
"port": "8447",
"enable_ssl": true,
"lb_policy":"ip_hash",
"visualRange": "1"
},
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v12",
- "url": "/aai/v12/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v13",
- "url": "/aai/v13/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v14",
- "url": "/aai/v14/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v15",
- "url": "/aai/v15/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v16",
- "url": "/aai/v16/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v17",
- "url": "/aai/v17/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v18",
- "url": "/aai/v18/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-cloudInfrastructure",
- "version": "v19",
- "url": "/aai/v19/cloud-infrastructure",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v11",
- "url": "/aai/v11/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v12",
- "url": "/aai/v12/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v13",
- "url": "/aai/v13/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v14",
- "url": "/aai/v14/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v15",
- "url": "/aai/v15/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v16",
- "url": "/aai/v16/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v17",
- "url": "/aai/v17/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v18",
- "url": "/aai/v18/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-business",
- "version": "v19",
- "url": "/aai/v19/business",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v11",
- "url": "/aai/v11/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v12",
- "url": "/aai/v12/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v13",
- "url": "/aai/v13/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v14",
- "url": "/aai/v14/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v15",
- "url": "/aai/v15/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v16",
- "url": "/aai/v16/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v17",
- "url": "/aai/v17/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v18",
- "url": "/aai/v18/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-actions",
- "version": "v19",
- "url": "/aai/v19/actions",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v11",
- "url": "/aai/v11/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v12",
- "url": "/aai/v12/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v13",
- "url": "/aai/v13/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v14",
- "url": "/aai/v14/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v15",
- "url": "/aai/v15/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v16",
- "url": "/aai/v16/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v17",
- "url": "/aai/v17/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v18",
- "url": "/aai/v18/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-service-design-and-creation",
- "version": "v19",
- "url": "/aai/v19/service-design-and-creation",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v11",
- "url": "/aai/v11/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v12",
- "url": "/aai/v12/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v13",
- "url": "/aai/v13/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v14",
- "url": "/aai/v14/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v15",
- "url": "/aai/v15/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v16",
- "url": "/aai/v16/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v17",
- "url": "/aai/v17/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v18",
- "url": "/aai/v18/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-network",
- "version": "v19",
- "url": "/aai/v19/network",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v11",
- "url": "/aai/v11/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v12",
- "url": "/aai/v12/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v13",
- "url": "/aai/v13/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v14",
- "url": "/aai/v14/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v15",
- "url": "/aai/v15/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v16",
- "url": "/aai/v16/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v17",
- "url": "/aai/v17/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v18",
- "url": "/aai/v18/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-externalSystem",
- "version": "v19",
- "url": "/aai/v19/external-system",
- "protocol": "REST",
- "port": "8447",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- }
+ {{- end }}
+ {{- end }}
]'
+ {{- end }}
spec:
hostname: aai-resources
{{- if .Values.global.initContainers.enabled }}
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 2685d9a..620b4d7 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2018 Amdocs, Bell Canada, AT&T
# Copyright (c) 2020 Nokia, Orange
+# 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.
@@ -116,6 +117,31 @@
realtime:
clients: SDNC,MSO,SO,robot-ete
+api_list:
+ - 11
+ - 12
+ - 13
+ - 14
+ - 15
+ - 16
+ - 17
+ - 18
+ - 19
+
+aai_enpoints:
+ - name: aai-cloudInfrastructure
+ url: cloud-infrastructure
+ - name: aai-business
+ url: business
+ - name: aai-actions
+ url: actions
+ - name: aai-service-design-and-creation
+ url: service-design-and-creation
+ - name: aai-network
+ url: network
+ - name: aai-externalSystem
+ url: external-system
+
# application image
image: onap/aai-resources:1.7.2
pullPolicy: Always
diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index ab1cb30..6f5ac82 100644
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -2,6 +2,7 @@
# Copyright (c) 2017 Amdocs, Bell Canada
# Modifications Copyright (c) 2018 AT&T
# Modifications Copyright (c) 2020 Nokia, Orange
+# 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.
@@ -39,304 +40,34 @@
name: {{ include "common.name" . }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+ {{- if .Values.global.msbEnabled }}
+ {{ $values := .Values }}
msb.onap.org/service-info: '[
+ {{- range $api_endpoint := $values.aai_enpoints -}}
+ {{- range $api_version := $values.api_list }}
{
- "serviceName": "_aai-generic-query",
- "version": "v11",
- "url": "/aai/v11/search/generic-query",
+ "serviceName": "_{{ $api_endpoint.name }}",
+ "version": "v{{ $api_version }}",
+ "url": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}",
"protocol": "REST",
"port": "8446",
"enable_ssl": true,
"lb_policy":"ip_hash",
"visualRange": "1",
- "path": "/aai/v11/search/generic-query"
+ "path": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}"
},
{
- "serviceName": "_aai-generic-query",
- "version": "v12",
- "url": "/aai/v12/search/generic-query",
+ "serviceName": "{{ $api_endpoint.name }}",
+ "version": "v{{ $api_version }}",
+ "url": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}",
"protocol": "REST",
"port": "8446",
"enable_ssl": true,
"lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/search/generic-query"
+ "visualRange": "1"
},
- {
- "serviceName": "_aai-generic-query",
- "version": "v13",
- "url": "/aai/v13/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/search/generic-query"
- },
- {
- "serviceName": "_aai-generic-query",
- "version": "v14",
- "url": "/aai/v14/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/search/generic-query"
- },
- {
- "serviceName": "_aai-generic-query",
- "version": "v15",
- "url": "/aai/v15/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/search/generic-query"
- },
- {
- "serviceName": "_aai-generic-query",
- "version": "v16",
- "url": "/aai/v16/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/search/generic-query"
- },
- {
- "serviceName": "_aai-generic-query",
- "version": "v17",
- "url": "/aai/v17/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/search/generic-query"
- },
- {
- "serviceName": "_aai-generic-query",
- "version": "v18",
- "url": "/aai/v18/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/search/generic-query"
- },
- {
- "serviceName": "_aai-generic-query",
- "version": "v19",
- "url": "/aai/v19/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/search/generic-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v11",
- "url": "/aai/v11/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v11/search/nodes-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v12",
- "url": "/aai/v12/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/search/nodes-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v13",
- "url": "/aai/v13/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/search/nodes-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v14",
- "url": "/aai/v14/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/search/nodes-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v15",
- "url": "/aai/v15/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/search/nodes-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v16",
- "url": "/aai/v16/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/search/nodes-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v17",
- "url": "/aai/v17/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/search/nodes-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v18",
- "url": "/aai/v18/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/search/nodes-query"
- },
- {
- "serviceName": "_aai-nodes-query",
- "version": "v19",
- "url": "/aai/v19/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/search/nodes-query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v11",
- "url": "/aai/v11/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v11/query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v12",
- "url": "/aai/v12/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v12/query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v13",
- "url": "/aai/v13/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v13/query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v14",
- "url": "/aai/v14/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v14/query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v15",
- "url": "/aai/v15/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v15/query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v16",
- "url": "/aai/v16/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v16/query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v17",
- "url": "/aai/v17/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v17/query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v18",
- "url": "/aai/v18/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v18/query"
- },
- {
- "serviceName": "_aai-query",
- "version": "v19",
- "url": "/aai/v19/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1",
- "path": "/aai/v19/query"
- },
+ {{- end }}
+ {{- end }}
{
"serviceName": "_aai-named-query",
"url": "/aai/search",
@@ -348,276 +79,6 @@
"path": "/aai/search"
},
{
- "serviceName": "aai-generic-query",
- "version": "v11",
- "url": "/aai/v11/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-generic-query",
- "version": "v12",
- "url": "/aai/v12/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-generic-query",
- "version": "v13",
- "url": "/aai/v13/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-generic-query",
- "version": "v14",
- "url": "/aai/v14/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-generic-query",
- "version": "v15",
- "url": "/aai/v15/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-generic-query",
- "version": "v16",
- "url": "/aai/v16/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-generic-query",
- "version": "v17",
- "url": "/aai/v17/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-generic-query",
- "version": "v18",
- "url": "/aai/v18/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-generic-query",
- "version": "v19",
- "url": "/aai/v19/search/generic-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v11",
- "url": "/aai/v11/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v12",
- "url": "/aai/v12/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v13",
- "url": "/aai/v13/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v14",
- "url": "/aai/v14/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v15",
- "url": "/aai/v15/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v16",
- "url": "/aai/v16/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v17",
- "url": "/aai/v17/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v18",
- "url": "/aai/v18/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-nodes-query",
- "version": "v19",
- "url": "/aai/v19/search/nodes-query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v11",
- "url": "/aai/v11/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v12",
- "url": "/aai/v12/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v13",
- "url": "/aai/v13/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v14",
- "url": "/aai/v14/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v15",
- "url": "/aai/v15/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v16",
- "url": "/aai/v16/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v17",
- "url": "/aai/v17/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v18",
- "url": "/aai/v18/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
- "serviceName": "aai-query",
- "version": "v19",
- "url": "/aai/v19/query",
- "protocol": "REST",
- "port": "8446",
- "enable_ssl": true,
- "lb_policy":"ip_hash",
- "visualRange": "1"
- },
- {
"serviceName": "aai-named-query",
"url": "/aai/search",
"protocol": "REST",
@@ -627,6 +88,7 @@
"visualRange": "1"
}
]'
+ {{- end }}
spec:
hostname: aai-traversal
{{ if .Values.global.initContainers.enabled }}
@@ -653,7 +115,7 @@
{{- end }}
- --container-name
- aai-schema-service
- {{ end }}
+ {{ end }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index fbfcdae..0242ced 100644
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2018 Amdocs, Bell Canada, AT&T
# Modifications Copyright (c) 2020 Nokia
+# 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.
@@ -129,6 +130,26 @@
restartPolicy: Always
flavor: small
flavorOverride: small
+
+api_list:
+ - 11
+ - 12
+ - 13
+ - 14
+ - 15
+ - 16
+ - 17
+ - 18
+ - 19
+
+aai_enpoints:
+ - name: aai-generic-query
+ url: search/generic-query
+ - name: aai-nodes-query
+ url: search/nodes-query
+ - name: aai-nquery
+ url: query
+
# application configuration
config: