Merge "Refactor Policy PAP for common service template"

diff --git a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
index 94a47fe..881ed22 100755 (executable)
--- a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
+++ b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
@@ -238,7 +238,7 @@ server_url = https://{{.Values.config.aai.serviceName}}.{{ include "common.names
 #aai_retries = 3
 
 # The version of A&AI in v# format. (string value)
-server_url_version = v14
+server_url_version = v19
 
 # SSL/TLS certificate file in pem format. This certificate must be registered
 # with the A&AI endpoint. (string value)

diff --git a/kubernetes/oof/charts/oof-has/values.yaml b/kubernetes/oof/charts/oof-has/values.yaml
index f4debe9..309b59c 100755 (executable)
--- a/kubernetes/oof/charts/oof-has/values.yaml
+++ b/kubernetes/oof/charts/oof-has/values.yaml
@@ -25,7 +25,7 @@ global:
   commonConfigPrefix: onap-oof-has
   image:
     readiness: oomk8s/readiness-check:2.0.0
-    optf_has: onap/optf-has:2.0.3
+    optf_has: onap/optf-has:2.0.4
     filebeat: docker.elastic.co/beats/filebeat:5.5.0
 
 pullPolicy: Always

diff --git a/kubernetes/oof/resources/config/common_config.yaml b/kubernetes/oof/resources/config/common_config.yaml
index bfee39b..9515f30 100644 (file)
--- a/kubernetes/oof/resources/config/common_config.yaml
+++ b/kubernetes/oof/resources/config/common_config.yaml
@@ -44,8 +44,7 @@ osdf_temp:  # special configuration required for "workarounds" or testing
         slice_selection_policy_dir_urllc_1: "./test/policy-local-files/"
         slice_selection_policy_files_urllc_1:
             - vnfPolicy_URLLC_Core_1.json
-            - thresholdPolicy_URLLC_Core_1_reliability.json
-            - thresholdPolicy_URLLC_Core_1_latency.json
+            - thresholdPolicy_URLLC_Core_1.json
             - subscriber_policy_URLLC_1.json
 
 service_info:

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index 5205a1d..13e0045 100644 (file)
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-osdf:2.0.3
+image: onap/optf-osdf:2.0.4
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -49,7 +49,7 @@ config:
 
   # Url and credentials for Conductor.
   conductorUrl: https://oof-has-api:8091/v1/plans/
-  conductorPingWaitTime: 60
+  conductorPingWaitTime: 10
   conductorMaxRetries: 30
   # versions to be set in HTTP header
   conductorMinorVersion: 0

diff --git a/kubernetes/readiness/src/main/scripts/ready.py b/kubernetes/readiness/src/main/scripts/ready.py
index 9393207..b932b04 100644 (file)
--- a/kubernetes/readiness/src/main/scripts/ready.py
+++ b/kubernetes/readiness/src/main/scripts/ready.py
@@ -60,10 +60,8 @@ def wait_for_statefulset_complete(statefulset_name):
     try:
         response = api.read_namespaced_stateful_set(statefulset_name, namespace)
         s = response.status
-        if (s.updated_replicas == response.spec.replicas and
-                s.replicas == response.spec.replicas and
+        if (s.replicas == response.spec.replicas and
                 s.ready_replicas == response.spec.replicas and
-                s.current_replicas == response.spec.replicas and
                 s.observed_generation == response.metadata.generation):
             log.info("Statefulset " + statefulset_name + "  is ready")
             return True

diff --git a/kubernetes/robot b/kubernetes/robot
index 77f1d25..51322d3 160000 (submodule)
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit 77f1d25542848d7a5fd32f57436c9f413e0a5919
+Subproject commit 51322d3b374588a051b4a5522fbd25ac92ffb328