mkadilov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#316] ir/netmap: Rename LOCODE attribute key

Browse source 
Rename key to LOCODE node attribute from `Locode` to `UN-LOCODE`.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-02-10 13:13:42 +03:00 committed by Leonard Lyubich
parent c384fbbf4e
commit 0a87fec6c6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/innerring/processors/netmap/nodevalidation/locode/calls.go
View file

@ -10,10 +10,10 @@ var errMissingLocode = errors.New("missing locode attribute")
var errMissingRequiredAttr = errors.New("missing required attribute in DB record") var errMissingRequiredAttr = errors.New("missing required attribute in DB record")
// VerifyAndUpdate validates LOCODE attribute of n // VerifyAndUpdate validates UN-LOCODE attribute of n
// and adds a group of related attributes. // and adds a group of related attributes.
// //
// If n does not contain LOCODE attribute or its value does not // If n does not contain UN-LOCODE attribute or its value does not
// match the UN/LOCODE format, an error returns. // match the UN/LOCODE format, an error returns.
// //
// New attributes are formed from the record of DB instance (Prm). // New attributes are formed from the record of DB instance (Prm).
@ -26,7 +26,7 @@ var errMissingRequiredAttr = errors.New("missing required attribute in DB record
// * SubDiv: R.SubDivName(); // * SubDiv: R.SubDivName();
// * Continent: R.Continent().String(). // * Continent: R.Continent().String().
// //
// LOCODE attribute remains untouched. // UN-LOCODE attribute remains untouched.
func (v *Validator) VerifyAndUpdate(n *netmap.NodeInfo) error { func (v *Validator) VerifyAndUpdate(n *netmap.NodeInfo) error {
mAttr := uniqueAttributes(n.Attributes()) mAttr := uniqueAttributes(n.Attributes())

2
pkg/innerring/processors/netmap/nodevalidation/locode/validator.go
View file

@ -28,7 +28,7 @@ type Validator struct {
// TODO: define constants in API lib. // TODO: define constants in API lib.
const ( const (
attrKeyLocode = "Locode" attrKeyLocode = "UN-LOCODE"
attrKeyCountryCode = "CountryCode" attrKeyCountryCode = "CountryCode"
attrKeyCountry = "Country" attrKeyCountry = "Country"