From 4ba44b4513bcc039a61baba27ff21dc9849cca95 Mon Sep 17 00:00:00 2001
From: ss412g <shuky.har-noy@intl.att.com>
Date: Wed, 27 Nov 2019 17:20:20 +0200
Subject: [PATCH] [RICPLT-2775] - remove resource status request params from
 configuration

Change-Id: I7dbc3b812d52c2e8360d74e64cb6e69cf7ef94ac
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>
---
 ci/package-tag.yaml                                |  2 +-
 .../helm/rsm/templates/configmap.yaml              | 63 ----------------------
 ric-platform/50-RIC-Platform/helm/rsm/values.yaml  |  1 -
 3 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/ci/package-tag.yaml b/ci/package-tag.yaml
index cc344511..a6e73be4 100644
--- a/ci/package-tag.yaml
+++ b/ci/package-tag.yaml
@@ -14,4 +14,4 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-tag: 2.0.3
+tag: 2.0.4
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml
index c8eca961..c5882b10 100755
--- a/ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml
@@ -73,67 +73,4 @@ data:
       {{- else }}
       rnibRetryIntervalMs: 10
       {{- end }}
-    characteristics:
-      {{- if hasKey .Values.rsm "enableResourceStatus" }}
-      enableResourceStatus: {{ .Values.rsmenableResourceStatus }}
-      {{- else }}
-      enableResourceStatus: true
-      {{- end }}
-      {{- if hasKey .Values.rsm "prbPeriodic" }}
-      prbPeriodic: {{ .Values.rsm.prbPeriodic }}
-      {{- else }}
-      prbPeriodic: true
-      {{- end }}
-      {{- if hasKey .Values.rsm "tnlLoadIndPeriodic" }}
-      tnlLoadIndPeriodic: {{ .Values.rsm.tnlLoadIndPeriodic }}
-      {{- else }}
-      tnlLoadIndPeriodic: true
-      {{- end }}
-      {{- if hasKey .Values.rsm "hwLoadIndPeriodic" }}
-      hwLoadIndPeriodic: {{ .Values.rsm.hwLoadIndPeriodic }}
-      {{- else }}
-      hwLoadIndPeriodic: true
-      {{- end }}
-      {{- if hasKey .Values.rsm "absStatusPeriodic" }}
-      absStatusPeriodic: {{ .Values.rsm.absStatusPeriodic }}
-      {{- else }}
-      absStatusPeriodic: true
-      {{- end }}
-      {{- if hasKey .Values.rsm "rsrpMeasurementPeriodic" }}
-      rsrpMeasurementPeriodic: {{ .Values.rsm.rsrpMeasurementPeriodic }}
-      {{- else }}
-      rsrpMeasurementPeriodic: true
-      {{- end }}
-      {{- if hasKey .Values.rsm "csiPeriodic" }}
-      csiPeriodic: {{ .Values.rsm.csiPeriodic }}
-      {{- else }}
-      csiPeriodic: true
-      {{- end }}
-      {{- if hasKey .Values.rsm "periodicityMs" }}
-      periodicityMs: {{ .Values.rsm.periodicityMs }}
-      {{- else }}
-      periodicityMs: 1
-      {{- end }}
-      {{- if hasKey .Values.rsm "periodicityRsrpMeasurementMs" }}
-      periodicityRsrpMeasurementMs: {{ .Values.rsm.periodicityRsrpMeasurementMs }}
-      {{- else }}
-      periodicityRsrpMeasurementMs: 120
-      {{- end }}
-      {{- if hasKey .Values.rsm "periodicityCsiMs" }}
-      periodicityCsiMs: {{ .Values.rsm.periodicityCsiMs }}
-      {{- else }}
-      periodicityCsiMs: 5
-      {{- end }}
-    resourceStatusParams:
-      enableResourceStatus: true
-      partialSuccessAllowed: true
-      prbPeriodic: true
-      tnlLoadIndPeriodic: true
-      hwLoadIndPeriodic: true
-      absStatusPeriodic: true
-      rsrpMeasurementPeriodic: true
-      csiPeriodic: true
-      periodicityMs: 1000
-      periodicityRsrpMeasurementMs: 480
-      periodicityCsiMs: 20
 ---
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/values.yaml b/ric-platform/50-RIC-Platform/helm/rsm/values.yaml
index 6aaa94fd..cdd19e0e 100755
--- a/ric-platform/50-RIC-Platform/helm/rsm/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rsm/values.yaml
@@ -43,7 +43,6 @@ rsm:
   privilegedmode: false
 
   replicaCount: 1
-  enableResourceStatus: true
 
 
   # Service ports are now defined in
-- 
2.16.6