From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Mon, 26 Nov 2018 13:51:18 +0000 (+0000)
Subject: Merge "use config value instead hard code of url"
X-Git-Tag: 3.0.0-ONAP~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0cbdd7ad77ac3476c5807c143561b2968113387e;hp=b97bfdc3d5bce4b9e4029b4244563d39e489ee3e;p=oom.git

Merge "use config value instead hard code of url"
---

diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
index 688e06f8b6..a4a1b27a0d 100755
--- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -39,6 +39,9 @@ pnf:
     consumerGroup: consumerGroup
     consumerId: consumerId
     topicListenerDelayInSeconds: 5
+bpelURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081
+msb-ip: msb-iag.{{ include "common.namespace" . }}
+msb-port: 80
 mso:
   msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   correlation:
@@ -86,6 +89,9 @@ mso:
         endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}g:8087/services/rest/v1/volume-groups
     vnf-async:
       endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAsync
+    vfc:
+      rest:
+        endpoint: http://so-vfc-adapter.{{ include "common.namespace" . }}:8084/vfc/rest/v1/vfcadapter
     workflow:
       message:
         endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
@@ -166,6 +172,10 @@ mso:
             uri: /aai/v14/network/vces/vce
           vpn-binding:
             uri: /aai/v14/network/vpn-bindings/vpn-binding
+          sp-partner:
+            uri: /aai/v14/business/sp-partners/sp-partner
+          device:
+            uri: /aai/v14/network/devices/device
         v11:
           customer:
             uri: /aai/v11/business/customers/customer
diff --git a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
index da26017c4d..0eb083dbac 100755
--- a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
@@ -31,6 +31,8 @@ server:
 mso:
   site-name: localSite
   logPath: ./logs/vfc
+  msb-ip: msb-iag.{{ include "common.namespace" . }}
+  msb-port: 80
   adapters:
     requestDb:
       endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083