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

[#362] ir/netmap: Use const keys to node attributes from the API lib

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-02-10 23:54:27 +03:00 committed by Leonard Lyubich
parent 34248b00ed
commit a737a46988
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ var errMissingRequiredAttr = errors.New("missing required attribute in DB record
func (v *Validator) VerifyAndUpdate(n *netmap.NodeInfo) error { func (v *Validator) VerifyAndUpdate(n *netmap.NodeInfo) error {
mAttr := uniqueAttributes(n.Attributes()) mAttr := uniqueAttributes(n.Attributes())
attrLocode, ok := mAttr[attrKeyLocode] attrLocode, ok := mAttr[netmap.AttrUNLOCODE]
if !ok { if !ok {
return errMissingLocode return errMissingLocode
} }

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

@ -1,5 +1,9 @@
package locode package locode
import (
"github.com/nspcc-dev/neofs-api-go/pkg/netmap"
)
// Prm groups the required parameters of the Validator's constructor. // Prm groups the required parameters of the Validator's constructor.
// //
// All values must comply with the requirements imposed on them. // All values must comply with the requirements imposed on them.
@ -26,21 +30,6 @@ type Validator struct {
mAttr map[string]attrDescriptor mAttr map[string]attrDescriptor
} }
// TODO: define constants in API lib.
const (
attrKeyLocode = "UN-LOCODE"
attrKeyCountryCode = "CountryCode"
attrKeyCountry = "Country"
attrKeyLocation = "Location"
attrKeySubDivCode = "SubDivCode"
attrKeySubDiv = "SubDiv"
attrKeyContinent = "Continent"
)
// New creates a new instance of the Validator. // New creates a new instance of the Validator.
// //
// Panics if at least one value of the parameters is invalid. // Panics if at least one value of the parameters is invalid.
@ -51,15 +40,15 @@ func New(prm Prm) *Validator {
return &Validator{ return &Validator{
db: prm.DB, db: prm.DB,
mAttr: map[string]attrDescriptor{ mAttr: map[string]attrDescriptor{
attrKeyCountryCode: {converter: countryCodeValue}, netmap.AttrCountryCode: {converter: countryCodeValue},
attrKeyCountry: {converter: countryValue}, netmap.AttrCountry: {converter: countryValue},
attrKeyLocation: {converter: locationValue}, netmap.AttrLocation: {converter: locationValue},
attrKeySubDivCode: {converter: subDivCodeValue, optional: true}, netmap.AttrSubDivCode: {converter: subDivCodeValue, optional: true},
attrKeySubDiv: {converter: subDivValue, optional: true}, netmap.AttrSubDiv: {converter: subDivValue, optional: true},
attrKeyContinent: {converter: continentValue}, netmap.AttrContinent: {converter: continentValue},
}, },
} }
} }