mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-21 15:56:07 +08:00
Merge pull request #1402 from gravitl/feature_v0.14.6_addressrangevalidation
Fixed by adding validation tags.
This commit is contained in:
commit
5293a08c94
|
@ -223,16 +223,16 @@ func TestValidateNetwork(t *testing.T) {
|
||||||
NetID: "skynet",
|
NetID: "skynet",
|
||||||
AddressRange: "10.0.0.256",
|
AddressRange: "10.0.0.256",
|
||||||
},
|
},
|
||||||
errMessage: "Field validation for 'AddressRange' failed on the 'cidr' tag",
|
errMessage: "Field validation for 'AddressRange' failed on the 'cidrv4' tag",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
testname: "InvalidAddress6",
|
||||||
|
network: models.Network{
|
||||||
|
NetID: "skynet1",
|
||||||
|
AddressRange6: "2607::ffff/130",
|
||||||
|
},
|
||||||
|
errMessage: "Field validation for 'AddressRange6' failed on the 'cidrv6' tag",
|
||||||
},
|
},
|
||||||
//{
|
|
||||||
// testname: "InvalidAddress6",
|
|
||||||
// network: models.Network{
|
|
||||||
// NetID: "skynet1",
|
|
||||||
// AddressRange6: "2607::ffff/130",
|
|
||||||
// },
|
|
||||||
// errMessage: "Field validation for 'AddressRange6' failed on the 'cidr' tag",
|
|
||||||
//},
|
|
||||||
{
|
{
|
||||||
testname: "InvalidNetID",
|
testname: "InvalidNetID",
|
||||||
network: models.Network{
|
network: models.Network{
|
||||||
|
@ -287,7 +287,7 @@ func TestValidateNetwork(t *testing.T) {
|
||||||
network.SetDefaults()
|
network.SetDefaults()
|
||||||
err := logic.ValidateNetwork(&network, false)
|
err := logic.ValidateNetwork(&network, false)
|
||||||
assert.NotNil(t, err)
|
assert.NotNil(t, err)
|
||||||
assert.Contains(t, err.Error(), tc.errMessage)
|
assert.Contains(t, err.Error(), tc.errMessage) // test passes if err.Error() contains the expected errMessage.
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,8 +7,8 @@ import (
|
||||||
// Network Struct - contains info for a given unique network
|
// Network Struct - contains info for a given unique network
|
||||||
//At some point, need to replace all instances of Name with something else like Identifier
|
//At some point, need to replace all instances of Name with something else like Identifier
|
||||||
type Network struct {
|
type Network struct {
|
||||||
AddressRange string `json:"addressrange" bson:"addressrange" validate:"omitempty,cidr"`
|
AddressRange string `json:"addressrange" bson:"addressrange" validate:"omitempty,cidrv4"`
|
||||||
AddressRange6 string `json:"addressrange6" bson:"addressrange6"`
|
AddressRange6 string `json:"addressrange6" bson:"addressrange6" validate:"omitempty,cidrv6"`
|
||||||
NetID string `json:"netid" bson:"netid" validate:"required,min=1,max=12,netid_valid"`
|
NetID string `json:"netid" bson:"netid" validate:"required,min=1,max=12,netid_valid"`
|
||||||
NodesLastModified int64 `json:"nodeslastmodified" bson:"nodeslastmodified"`
|
NodesLastModified int64 `json:"nodeslastmodified" bson:"nodeslastmodified"`
|
||||||
NetworkLastModified int64 `json:"networklastmodified" bson:"networklastmodified"`
|
NetworkLastModified int64 `json:"networklastmodified" bson:"networklastmodified"`
|
||||||
|
|
Loading…
Reference in a new issue