util: Remove hardware specific values from BS router_config #2131
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -23,6 +23,7 @@ import ( | |||||
| "go.thethings.network/lorawan-stack/pkg/errors" | ||||||
| "go.thethings.network/lorawan-stack/pkg/frequencyplans" | ||||||
| . "go.thethings.network/lorawan-stack/pkg/pfconfig/shared" | ||||||
| "go.thethings.network/lorawan-stack/pkg/util/pointers" | ||||||
| ) | ||||||
|
|
||||||
| func TestSX1301Conf(t *testing.T) { | ||||||
|
|
@@ -88,25 +89,24 @@ func TestSX1301Conf(t *testing.T) { | |||||
| }, | ||||||
| SX1301Config{ | ||||||
| LoRaWANPublic: true, | ||||||
| ClockSource: pointers.Uint8(1), | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| AntennaGain: 0, | ||||||
| Radios: []RFConfig{ | ||||||
| { | ||||||
| Enable: true, | ||||||
| Type: "SX1257", | ||||||
| Frequency: 867500000, | ||||||
| TxEnable: pointers.Bool(true), | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| TxFreqMin: 863000000, | ||||||
| TxFreqMax: 870000000, | ||||||
| RSSIOffset: pointers.Float32(-166), | ||||||
|
There was a problem hiding this comment. This is the only place you actually may want to have a helper function, since there are 2 usages. |
||||||
| }, | ||||||
| { | ||||||
| Enable: true, Type: "SX1257", | ||||||
| Frequency: 868500000, | ||||||
| TxFreqMin: 0, | ||||||
| TxFreqMax: 0, | ||||||
| RSSIOffset: pointers.Float32(-166), | ||||||
| }, | ||||||
| }, | ||||||
| Channels: []IFConfig{ | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // Copyright © 2020 The Things Network Foundation, The Things Industries B.V. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package pointers | ||
|
|
||
| import "time" | ||
|
|
||
| // Bool returns a boolean pointer for the given value. | ||
| func Bool(v bool) *bool { return &v } | ||
|
There was a problem hiding this comment. If this is a one-time thing you could just oneline this. E.g. Otherwise just have a non-exported There was a problem hiding this comment. Why not? Then I need to define the same There was a problem hiding this comment. Yes, that is inherent to Go |
||
|
|
||
| // Duration returns a duration pointer for the given value. | ||
| func Duration(d time.Duration) *time.Duration { return &d } | ||
|
|
||
| // Time returns a time.Time pointer for the given value. | ||
| func Time(t time.Time) *time.Time { return &t } | ||
|
|
||
| // Float32 returns a float32 pointer for the given value. | ||
| func Float32(v float32) *float32 { return &v } | ||
|
|
||
| // Uint8 returns a uint8 pointer for the given value. | ||
| func Uint8(v uint8) *uint8 { return &v } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't the underlying problem that we have radio specific fields in the frequency plan?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well these fields are valid
SX1301_conffields. Issue is that basic station specifically already has a config file on each hardware and hardware specific fields are already present there.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But isn't that true for other gateways too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most gateways use what's provided in the
global_conf.jsonright? Some have overrides inlocal_conf.jsonbut not all of them afaik.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What I understand from #2130 is that we send information too specific about a gateway to a gateway. That makes me think that we have fields in our frequency plans that don't belong there. So removing those from BSLNS as you do here is a fix, but it's a fix for the symptoms. We may need to remove these fields from the frequency plans,
pfconfigand GCS.