beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork: ipvlan: make configuration.fromOptions a constructor

Browse source 
This was effectively a constructor, but through some indirection; make it a
regular function, which is a bit more idiomatic.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-07-01 11:17:10 +02:00
parent 4e39cdd9bb
commit 1a1a885423
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libnetwork/drivers/ipvlan/ipvlan_network.go
View file

@ -223,8 +223,7 @@ func parseNetworkGenericOptions(data interface{}) (*configuration, error) {
case *configuration:
config = opt
case map[string]string:
config = &configuration{}
err = config.fromOptions(opt)
return newConfigFromLabels(opt), nil
case options.Generic:
var opaqueConfig interface{}
if opaqueConfig, err = options.GenerateFromModel(opt, config); err == nil {
@ -236,8 +235,9 @@ func parseNetworkGenericOptions(data interface{}) (*configuration, error) {
return config, err
}
// fromOptions binds the generic options to networkConfiguration to cache
func (config *configuration) fromOptions(labels map[string]string) error {
// newConfigFromLabels creates a new configuration from the given labels.
func newConfigFromLabels(labels map[string]string) *configuration {
config := &configuration{}
for label, value := range labels {
switch label {
case parentOpt:
@ -251,7 +251,8 @@ func (config *configuration) fromOptions(labels map[string]string) error {
config.IpvlanFlag = value
}
}
return nil
return config
}
// processIPAM parses v4 and v6 IP information and binds it to the network configuration