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

libnetwork: macvlan: 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:20:30 +02:00
parent 99bde59229
commit 1992190162
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libnetwork/drivers/macvlan/macvlan_network.go
View file

@ -203,8 +203,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 {
@ -217,8 +216,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:
@ -230,7 +230,7 @@ func (config *configuration) fromOptions(labels map[string]string) error {
}
}
return nil
return config
}
// processIPAM parses v4 and v6 IP information and binds it to the network configuration