From 8a67988a8e8e19d92cc438d235223a40f3ea130c Mon Sep 17 00:00:00 2001
From: Matthew William Edwards <matthewedwards@fb.com>
Date: Tue, 23 Feb 2021 17:26:28 -0500
Subject: [PATCH] Add metrics.yaml to ran-simulator

- Remove pci.yaml file and the mapping from templates

- Add metrics.yaml file and mapping in templates

- Bump ran-simulator version in values.yaml
---
 ran-simulator/files/metrics/metrics.yaml | 45 ++++++++++++++++++++++++
 ran-simulator/files/metrics/pci.yaml     | 43 ----------------------
 ran-simulator/templates/configmap.yaml   |  4 +--
 ran-simulator/values.yaml                |  2 +-
 4 files changed, 48 insertions(+), 46 deletions(-)
 create mode 100644 ran-simulator/files/metrics/metrics.yaml
 delete mode 100644 ran-simulator/files/metrics/pci.yaml

diff --git a/ran-simulator/files/metrics/metrics.yaml b/ran-simulator/files/metrics/metrics.yaml
new file mode 100644
index 00000000..9a79a336
--- /dev/null
+++ b/ran-simulator/files/metrics/metrics.yaml
@@ -0,0 +1,45 @@
+metrics:
+  rc:
+    pci:
+      cells:
+        84325717505:
+            cellSize: ENTERPRISE
+            earfcn: 71
+            pci: 42
+            pciPool:
+              - min: 40
+                max: 50
+              - min: 80
+                max: 85
+        84325717506:
+          cellSize: OUTDOOR_SMALL
+          earfcn: 72
+          pci: 27
+          pciPool:
+            - min: 20
+              max: 30
+        84325717761:
+          cellSize: ENTERPRISE
+          earfcn: 73
+          pci: 62
+          pciPool:
+            - min: 60
+              max: 65
+            - min: 70
+              max: 80
+        84325717762:
+          cellSize: FEMTO
+          earfcn: 74
+          pci: 16
+          pciPool:
+            - min: 10
+              max: 20
+        84325717763:
+          cellSize: ENTERPRISE
+          earfcn: 75
+          pci: 69
+          pciPool:
+            - min: 65
+              max: 70
+            - min: 85
+              max: 90
diff --git a/ran-simulator/files/metrics/pci.yaml b/ran-simulator/files/metrics/pci.yaml
deleted file mode 100644
index 5522e091..00000000
--- a/ran-simulator/files/metrics/pci.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-pcis:
-  cells:
-    84325717505:
-        cellSize: ENTERPRISE
-        earfcn: 71
-        pci: 42
-        pciPool:
-          - min: 40
-            max: 50
-          - min: 80
-            max: 85
-    84325717506:
-      cellSize: OUTDOOR_SMALL
-      earfcn: 72
-      pci: 27
-      pciPool:
-        - min: 20
-          max: 30
-    84325717761:
-      cellSize: ENTERPRISE
-      earfcn: 73
-      pci: 62
-      pciPool:
-        - min: 60
-          max: 65
-        - min: 70
-          max: 80
-    84325717762:
-      cellSize: FEMTO
-      earfcn: 74
-      pci: 16
-      pciPool:
-        - min: 10
-          max: 20
-    84325717763:
-      cellSize: ENTERPRISE
-      earfcn: 75
-      pci: 69
-      pciPool:
-        - min: 65
-          max: 70
-        - min: 85
-          max: 90
diff --git a/ran-simulator/templates/configmap.yaml b/ran-simulator/templates/configmap.yaml
index d2b71051..8e9d3f42 100644
--- a/ran-simulator/templates/configmap.yaml
+++ b/ran-simulator/templates/configmap.yaml
@@ -12,10 +12,10 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 data:
+  metrics.yaml: |-
+  {{ .Files.Get "files/metrics/metrics.yaml" | indent 4}}
   model.yaml: |-
   {{ .Files.Get "files/model/model.yaml" | indent 4}}
-  pci.yaml: |-
-  {{ .Files.Get "files/metrics/pci.yaml" | indent 4}}
   logging.yaml: |-
 {{ toYaml .Values.logging | indent 4 }}
 
diff --git a/ran-simulator/values.yaml b/ran-simulator/values.yaml
index 057b854e..1e40e560 100644
--- a/ran-simulator/values.yaml
+++ b/ran-simulator/values.yaml
@@ -16,7 +16,7 @@ replicaCount: 1
 image:
   registry: ""
   repository: onosproject/ran-simulator
-  tag: v0.7.10
+  tag: v0.7.11
   pullPolicy: IfNotPresent
   pullSecrets: []