From: wrider <lji@research.att.com>
Date: Mon, 13 Jan 2020 21:57:00 +0000 (-0500)
Subject: Fix versions and config for E2, E2M, RSM
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=28e510fce5e256765a1093743986932cec52f90e;p=it%2Fdep.git

Fix versions and config for E2, E2M, RSM

Change-Id: I1b08440932b28a4791cce565e0a22df8fcfee7c9
Signed-off-by: wrider <lji@research.att.com>
---

diff --git a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
index 3ac13a60..9cf739ef 100644
--- a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
@@ -120,7 +120,7 @@ dbaas:
     iterminationGracePeriodSeconds: 0
     image:
       name: ric-plt-dbaas
-      tag: 0.2.2
+      tag: 0.1.0
 
 # E2 Manager
 e2mgr:
@@ -128,7 +128,7 @@ e2mgr:
   # repositoryOverride:
   image:
     name: ric-plt-e2mgr
-    tag: 3.0.1
+    tag: 2.0.10
   env:
     RIC_ID: "bbbccc-abcd0e/20"
   privilegedmode: false
@@ -140,7 +140,7 @@ e2term:
   # repositoryOverride:
   image:
     name: ric-plt-e2
-    tag: 3.0.1
+    tag: 2.0.10
   env:
     print: "1"
   privilegedmode: false
@@ -180,7 +180,7 @@ vespamgr:
 rsm:
   image:
     name: ric-plt-resource-status-manager
-    tag: 3.0.1
+    tag: 2.0.10
 
 # Jaeger Adapter
 jaegeradapter:
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 c5882b10..de73aa4b 100755
--- a/ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml
@@ -73,4 +73,68 @@ 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
+
 ---