Merge "Modify AAI service endpoints annotation"

diff --combined kubernetes/aai/templates/all-services.yaml
index 4257dbb,62e5943..4fcafd3
--- 1/kubernetes/aai/templates/all-services.yaml
--- 2/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@@ -36,8 -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 +45,18 @@@
        },
        {
            "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 +64,18 @@@
        },
        {
            "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 +83,18 @@@
        },
        {
            "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 +102,18 @@@
        },
        {
            "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 +121,18 @@@
        },
        {
            "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,25 -140,25 +140,25 @@@
        },
        {
            "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:
    - name: "aai-service-port-8443"
      port: 8443
      targetPort: 8443
 -    nodePort: 30233
 +    nodePort: {{ .Values.nodePortPrefix }}33
    - name: "aai-service-port-8080"
      port: 8080
      targetPort: 8080
 -    nodePort: 30232
 +    nodePort: {{ .Values.nodePortPrefix }}32
    type: NodePort
    selector:
      app: aai-service
@@@ -174,10 -174,10 +174,10 @@@ spec
    ports:
    - name: "model-loader-service-port-8443"
      port: 8443
 -    nodePort: 30229
 +    nodePort: {{ .Values.nodePortPrefix }}29
    - name: "model-loader-service-port-8080"
      port: 8080
 -    nodePort: 30210
 +    nodePort: {{ .Values.nodePortPrefix }}10
    type: NodePort
    selector:
      app: model-loader-service
@@@ -229,6 -229,38 +229,6 @@@ spec
  ---
  apiVersion: v1
  kind: Service
 -metadata:
 -  name: aai-dmaap
 -  namespace: "{{ .Values.nsPrefix }}-aai"
 -  labels:
 -    app: aai-dmaap
 -spec:
 -  ports:
 -  - name: "aai-dmaap-port-3904"
 -    port: 3904
 -  - name: "aai-dmaap-port-3905"
 -    port: 3905
 -  selector:
 -    app: aai-dmaap
 -  clusterIP: None
 ----
 -apiVersion: v1
 -kind: Service
 -metadata:
 -  name: aai-zookeeper
 -  namespace: "{{ .Values.nsPrefix }}-aai"
 -  labels:
 -    app: aai-zookeeper
 -spec:
 -  ports:
 -  - name: "aai-zookeeper-port-2181"
 -    port: 2181
 -  selector:
 -    app: aai-zookeeper
 -  clusterIP: None
 ----
 -apiVersion: v1
 -kind: Service
  metadata:
    name: aai-traversal
    namespace: "{{ .Values.nsPrefix }}-aai"