[SO] use v2 version for VNFs

SO BPMN infra uses "v1" version for VNF handling, which is not
compatible with multicloud.
This patch allows to choose which version to use, defaulting to "v2"
version.

Issue-ID: SO-3342
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I548f9f1e264ea7a21ee2d604e5de5c3b65599943

diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index 4429bd9..6aa2356 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -92,7 +92,7 @@ mso:
     vnf:
       endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAdapter
       rest:
-        endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/vnfs
+        endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/{{ .Values.vnf.api.version }}/vnfs
     volume-groups:
       rest:
         endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/volume-groups

diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index b6f315a..034e269 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -56,8 +56,6 @@ secrets:
 #  - 'my file 1'
 #  - '{{ include "templateThatGeneratesFileName" . }}'
 
-
-
 #################################################################
 # Application configuration defaults.
 #################################################################
@@ -102,6 +100,10 @@ so:
 sniro:
   endpoint: http://replaceme:28090/optimizationInstance/V1/create
 
+vnf:
+  api:
+    version: v2
+
 replicaCount: 1
 minReadySeconds: 10
 containerPort: &containerPort 8081
@@ -129,7 +131,6 @@ soHelpers:
     apiEnforcement: org.onap.so.bpmnPerm
   containerPort: *containerPort
 
-
 # Resource Limit flavor -By Default using small
 flavor: large
 # Segregation for Different environment (Small and Large)
@@ -150,13 +151,13 @@ resources:
       cpu: 1000m
   unlimited: {}
 livenessProbe:
-    path: /manage/health
-    scheme: HTTP
-    initialDelaySeconds: 600
-    periodSeconds: 60
-    timeoutSeconds: 10
-    successThreshold: 1
-    failureThreshold: 3
+  path: /manage/health
+  scheme: HTTP
+  initialDelaySeconds: 600
+  periodSeconds: 60
+  timeoutSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
 ingress:
   enabled: false
 nodeSelector: {}