AAI services registration via MSB

Change-Id: I09cfea85672285fb96d0449af2e1535249b1c125
Issue-ID: AAI-671
Signed-off-by: AdrianSlavkovsky <adrian.slavkovsky@orange.com>

diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index c07214d..2e9269e 100644 (file)
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -14,6 +14,387 @@ spec:
       labels:
         app: aai-resources
       name: aai-resources
+      annotations:
+        msb.onap.org/service-info: '[
+          {
+              "serviceName": "_aai-cloudInfrastructure",
+              "version": "v11",
+              "url": "/aai/v11/cloud-infrastructure",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1",
+              "path": "/aai/v11/cloud-infrastructure"
+          },
+          {
+              "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-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-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-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-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-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-cloudInfrastructure",
+              "version": "v11",
+              "url": "/aai/v11/cloud-infrastructure",
+              "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-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-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-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-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-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"
+          }      
+          ]'
     spec:
       initContainers:
       - command:

diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index 84a0d0f..4dbcd74 100644 (file)
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -14,6 +14,217 @@ spec:
       labels:
         app: aai-traversal
       name: aai-traversal
+      annotations:
+        msb.onap.org/service-info: '[
+          {
+              "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",
+              "path": "/aai/v11/search/generic-query"
+          },
+          {
+              "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",
+              "path": "/aai/v12/search/generic-query"
+          },
+          {
+              "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-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-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-named-query",
+              "url": "/aai/search",
+              "protocol": "REST",
+              "port": "8446",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1",
+              "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-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-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-named-query",
+              "url": "/aai/search",
+              "protocol": "REST",
+              "port": "8446",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1"
+          }
+          ]'
     spec:
       initContainers:
       - command:

diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index 01f24a7..b1ee989 100644 (file)
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -35,142 +35,6 @@ metadata:
   namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aai-service
-  annotations:
-    msb.onap.org/service-info: '[
-      {
-          "serviceName": "aai-cloudInfrastructure",
-          "version": "v11",
-          "url": "/aai/v11/cloud-infrastructure",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1"
-      },
-      {
-          "serviceName": "aai-cloudInfrastructure-deprecated",
-          "version": "v11",
-          "url": "/aai/v11/cloud-infrastructure",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1",
-          "path": "/aai/v11/cloud-infrastructure"
-      },
-      {
-          "serviceName": "aai-business",
-          "version": "v11",
-          "url": "/aai/v11/business",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1"
-      },
-      {
-          "serviceName": "aai-business-deprecated",
-          "version": "v11",
-          "url": "/aai/v11/business",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1",
-          "path": "/aai/v11/business"
-      },
-      {
-          "serviceName": "aai-search",
-          "version": "v11",
-          "url": "/aai/v11/search",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1"
-      },
-      {
-          "serviceName": "aai-search-deprecated",
-          "version": "v11",
-          "url": "/aai/v11/search",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1",
-          "path": "/aai/v11/search"
-      },
-      {
-          "serviceName": "aai-actions",
-          "version": "v11",
-          "url": "/aai/v11/actions",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1"
-      },
-      {
-          "serviceName": "aai-actions-deprecated",
-          "version": "v11",
-          "url": "/aai/v11/actions",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1",
-          "path": "/aai/v11/actions"
-      },
-      {
-          "serviceName": "aai-service-design-and-creation",
-          "version": "v11",
-          "url": "/aai/v11/service-design-and-creation",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1"
-      },
-      {
-          "serviceName": "aai-service-design-and-creation-deprecated",
-          "version": "v11",
-          "url": "/aai/v11/service-design-and-creation",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1",
-          "path": "/aai/v11/service-design-and-creation"
-      },
-      {
-          "serviceName": "aai-network",
-          "version": "v11",
-          "url": "/aai/v11/network",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1"
-      },
-      {
-          "serviceName": "aai-network-deprecated",
-          "version": "v11",
-          "url": "/aai/v11/network",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1",
-          "path": "/aai/v11/network"
-      },
-      {
-          "serviceName": "aai-externalSystem",
-          "version": "v11",
-          "url": "/aai/v11/external-system",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1"
-      },
-      {
-          "serviceName": "aai-externalSystem-deprecated",
-          "version": "v11",
-          "url": "/aai/v11/external-system",
-          "protocol": "REST",
-          "port": "8443",
-          "enable_ssl": true,
-          "visualRange": "1",
-          "path": "/aai/v11/external-system"
-      }
-      ]'
 spec:
   ports:
   - name: "aai-service-port-8443"