From 3865d69d33f8f69f7d075d8597b4178e3a5c1442 Mon Sep 17 00:00:00 2001
From: krishnaa96 <krishna.moorthy6@wipro.com>
Date: Mon, 22 Feb 2021 20:53:44 +0530
Subject: [OOF] Update image versions

- Update OSDF to 3.0.3
    - NST selection enhancements
    - Interface with consul
- Update HAS to 2.1.3
    - New candidate support(NST)
- Update CMSO to 2.3.1
    - Fixed security vulnerabilities

Issue-ID: OPTFRA-904
Signed-off-by: Krishna Moorthy <krishna.moorthy6@wipro.com>
Change-Id: Ib78325aba6e043c06a9e766298f91badf1af4d27
---
 .../oof/resources/config/conf/common_config.yaml       | 18 ++++++++++++++++++
 kubernetes/oof/resources/config/conf/osdf_config.yaml  |  3 +++
 2 files changed, 21 insertions(+)

(limited to 'kubernetes/oof/resources')

diff --git a/kubernetes/oof/resources/config/conf/common_config.yaml b/kubernetes/oof/resources/config/conf/common_config.yaml
index 1109ab8167..78afa5e5f8 100644
--- a/kubernetes/oof/resources/config/conf/common_config.yaml
+++ b/kubernetes/oof/resources/config/conf/common_config.yaml
@@ -12,6 +12,7 @@ osdf_temp:  # special configuration required for "workarounds" or testing
         global_disabled: True
         local_placement_policies_enabled: True
         local_slice_selection_policies_enabled: True
+        local_nst_selection_policies_enabled: True
         placement_policy_dir_vcpe: "./test/policy-local-files/"
         placement_policy_files_vcpe: # workaroud for policy platform glitches (or "work-arounds" for other components)
             - Affinity_vCPE_1.json
@@ -45,6 +46,12 @@ osdf_temp:  # special configuration required for "workarounds" or testing
             - query_policy_nsi.json
             - threshold_policy_nsi.json
             - vnf_policy_nsi_shared_case.json
+        nst_selection_policy_dir_nst: "./test/policy-local-files/nst-selection-files/"
+        nst_selection_policy_files_nst:
+            - query_policy_nst.json
+            - attribute_policy_nst.json
+            - vnf_policy_nst.json
+            - optimization_policy_nst.json
 
 service_info:
     vCPE:
@@ -95,6 +102,17 @@ policy_info:
                 resources:
                     - get_param: service_name
 
+    nst_selection:
+        policy_fetch: by_scope
+        policy_scope:
+            -
+                scope:
+                    - OSDF_GUILIN
+                services:
+                    - nst
+                resources:
+                    - nst
+
     subnet_selection:
         policy_fetch: by_scope
         policy_scope:
diff --git a/kubernetes/oof/resources/config/conf/osdf_config.yaml b/kubernetes/oof/resources/config/conf/osdf_config.yaml
index 97d037a8f8..6df3ed948b 100755
--- a/kubernetes/oof/resources/config/conf/osdf_config.yaml
+++ b/kubernetes/oof/resources/config/conf/osdf_config.yaml
@@ -67,3 +67,6 @@ desPassword: {{ .Values.config.desPassword }}
 
 #key
 appkey: ''
+
+activateConsulConfig: False
+
-- 
cgit 1.2.3-korg