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

@@ -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

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 }}
 

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: []