From: Mike Elliott <mike.elliott@amdocs.com>
Date: Tue, 19 Sep 2017 18:08:31 +0000 (+0000)
Subject: Merge "Add msb and kube2msb registrator to oneclick"
X-Git-Tag: 2.0.0-ONAP~648
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ced477af63cd1453f189dd4352e3e1dd6bf7658c;hp=c9fdc4c38032dc22cd7f22b66001561ff1a990a6;p=oom.git

Merge "Add msb and kube2msb registrator to oneclick"
---

diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index 0d9a68ac25..04c984df54 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -76,7 +76,7 @@ metadata:
           "serviceName": "policy-pdp",
           "version": "v1",
           "url": "/pdp",
-          "protocol": "REST"
+          "protocol": "REST",
           "port": "8081",
           "visualRange":"1"
       },
@@ -84,7 +84,7 @@ metadata:
           "serviceName": "policy-pdp-deprecated",
           "version": "v1",
           "url": "/pdp",
-          "protocol": "REST"
+          "protocol": "REST",
           "port": "8081",
           "visualRange":"1",
           "path":"/pdp"
diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml
index 88cbe8eeb8..2cd895b45a 100644
--- a/kubernetes/sdc/templates/all-services.yaml
+++ b/kubernetes/sdc/templates/all-services.yaml
@@ -54,6 +54,26 @@ metadata:
     app: sdc-be
   name: sdc-be
   namespace: "{{ .Values.nsPrefix }}-sdc"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "sdc",
+          "version": "v1",
+          "url": "/sdc/v1",
+          "protocol": "REST",
+          "port": "8080",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "sdc-deprecated",
+          "version": "v1",
+          "url": "/sdc/v1",
+          "protocol": "REST",
+          "port": "8080",
+          "visualRange":"1",
+          "path":"/sdc/v1"
+      }
+      ]'
 spec:
   ports:
   - name: sdc-be-port-8443
@@ -73,6 +93,17 @@ metadata:
     app: sdc-fe
   name: sdc-fe
   namespace: "{{ .Values.nsPrefix }}-sdc"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "sdc-gui",
+          "version": "v1",
+          "url": "/sdc1",
+          "protocol": "UI",
+          "port": "8181",
+          "visualRange":"0|1"
+      }
+      ]'
 spec:
   ports:
   - name: sdc-fe-port-9443