From: rui hu <hu.rui2@zte.com.cn>
Date: Wed, 6 Sep 2017 07:10:45 +0000 (+0000)
Subject: Merge "Modify AAI service endpoints annotation"
X-Git-Tag: 2.0.0-ONAP~687
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=53a6b7c543fc005f30ab2ca50058c0705c6d55cb;hp=97d0837a9e0371a5f18a3b47362bc61ccb50082b;p=oom.git

Merge "Modify AAI service endpoints annotation"
---

diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index 4257dbb8eb..4fcafd3307 100644
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -36,8 +36,8 @@ metadata:
     msb.onap.org/service-info: '[
       {
           "serviceName": "aai-cloudInfrastructure",
-          "version": "v1",
-          "url": "/cloud-infrastructure",
+          "version": "v11",
+          "url": "/aai/v11/cloud-infrastructure",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
@@ -45,18 +45,18 @@ metadata:
       },
       {
           "serviceName": "aai-cloudInfrastructure-deprecated",
-          "version": "v1",
-          "url": "/cloud-infrastructure",
+          "version": "v11",
+          "url": "/aai/v11/cloud-infrastructure",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
           "visualRange":"1",
-          "path":"/cloud-infrastructure"
+          "path":"/aai/v11/cloud-infrastructure"
       },
       {
           "serviceName": "aai-business",
-          "version": "v1",
-          "url": "/business",
+          "version": "v11",
+          "url": "/aai/v11/business",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
@@ -64,18 +64,18 @@ metadata:
       },
       {
           "serviceName": "aai-business-deprecated",
-          "version": "v1",
-          "url": "/business",
+          "version": "v11",
+          "url": "/aai/v11/business",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
           "visualRange":"1",
-          "path":"/business"
+          "path":"/aai/v11/business"
       },
       {
           "serviceName": "aai-search",
-          "version": "v1",
-          "url": "/search",
+          "version": "v11",
+          "url": "/aai/v11/search",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
@@ -83,18 +83,18 @@ metadata:
       },
       {
           "serviceName": "aai-search-deprecated",
-          "version": "v1",
-          "url": "/search",
+          "version": "v11",
+          "url": "/aai/v11/search",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
           "visualRange":"1",
-          "path":"/search"
+          "path":"/aai/v11/search"
       },
       {
           "serviceName": "aai-actions",
-          "version": "v1",
-          "url": "/actions",
+          "version": "v11",
+          "url": "/aai/v11/actions",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
@@ -102,18 +102,18 @@ metadata:
       },
       {
           "serviceName": "aai-actions-deprecated",
-          "version": "v1",
-          "url": "/actions",
+          "version": "v11",
+          "url": "/aai/v11/actions",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
           "visualRange":"1",
-          "path":"/actions"
+          "path":"/aai/v11/actions"
       },
       {
           "serviceName": "aai-service-design-and-creation",
-          "version": "v1",
-          "url": "/service-design-and-creation",
+          "version": "v11",
+          "url": "/aai/v11/service-design-and-creation",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
@@ -121,18 +121,18 @@ metadata:
       },
       {
           "serviceName": "aai-service-design-and-creation-deprecated",
-          "version": "v1",
-          "url": "/service-design-and-creation",
+          "version": "v11",
+          "url": "/aai/v11/service-design-and-creation",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
           "visualRange":"1",
-          "path":"/service-design-and-creation"
+          "path":"/aai/v11/service-design-and-creation"
       },
       {
           "serviceName": "aai-network",
-          "version": "v1",
-          "url": "/network",
+          "version": "v11",
+          "url": "/aai/v11/network",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
@@ -140,14 +140,14 @@ metadata:
       },
       {
           "serviceName": "aai-network-deprecated",
-          "version": "v1",
-          "url": "/network",
+          "version": "v11",
+          "url": "/aai/v11/network",
           "protocol": "REST",
           "port": "8443",
           "enable_ssl":"True",
           "visualRange":"1",
-          "path":"/network"
-      }             
+          "path":"/aai/v11/network"
+      }
       ]'
 spec:
   ports: