Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add metrics.yaml to ran-simulator #248

Merged
merged 1 commit into from
Mar 3, 2021
Merged

Add metrics.yaml to ran-simulator #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ran-simulator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ name: ran-simulator
description: ONOS RAN Simulator
kubeVersion: ">=1.15.0"
type: application
version: 1.0.21
appVersion: v0.7.10
version: 1.0.22
appVersion: v0.7.11
keywords:
- onos
- sdn
Expand Down
45 changes: 45 additions & 0 deletions ran-simulator/files/metrics/metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
metrics:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have a file there. Please use the same file in terms of content. https://github.com/onosproject/sdran-helm-charts/blob/master/ran-simulator/files/metrics/pci.yaml

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also rebse your local repo and resolve conflicts

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copied the content from pci.yaml to metrics.yaml and removed pci.yaml

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
43 changes: 0 additions & 43 deletions ran-simulator/files/metrics/pci.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ran-simulator/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

2 changes: 1 addition & 1 deletion ran-simulator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ replicaCount: 1
image:
registry: ""
repository: onosproject/ran-simulator
tag: v0.7.10
tag: v0.7.11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be increased when we release the ransim. You need to increase chart version for each release.

Copy link
Contributor Author

@MatthewWEdwards MatthewWEdwards Feb 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, so should I revert this diff back to v0.7.10? I'm a little confused what you meant by #248 (comment). Do I need to create a new PR when you release ransim v0.7.11? Do I need to take any action to update the tag in the ransim helm chart or is that done automatically?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is ok to increase the tag but we should merge ransim PR first and then release ransim image and then we can merge this PR. but what I don't see in your PR, the version of chart is not increased. look at chart.yaml. For each release of a chart you should increase chart version and that is why the build is failing.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/onosproject/sdran-helm-charts/blob/master/ran-simulator/Chart.yaml#L10

pullPolicy: IfNotPresent
pullSecrets: []

Expand Down