From a1051f3bf1b1078610c21c8a18bf43bad78680c4 Mon Sep 17 00:00:00 2001 From: SilverBut Date: Sat, 2 Oct 2021 23:49:59 +0800 Subject: [PATCH] dhcp ipam: rename inconsistent options among files Signed-off-by: SilverBut --- plugins/ipam/dhcp/daemon.go | 2 +- plugins/ipam/dhcp/lease.go | 8 ++++---- plugins/ipam/dhcp/main.go | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/ipam/dhcp/daemon.go b/plugins/ipam/dhcp/daemon.go index cdf11a8f..b17a6461 100644 --- a/plugins/ipam/dhcp/daemon.go +++ b/plugins/ipam/dhcp/daemon.go @@ -71,7 +71,7 @@ func (d *DHCP) Allocate(args *skel.CmdArgs, result *current.Result) error { return fmt.Errorf("error parsing netconf: %v", err) } - optsRequesting, optsProviding, err := prepareOptions(args.Args, conf.IPAM.ProvideOptions, conf.IPAM.RequireOptions) + optsRequesting, optsProviding, err := prepareOptions(args.Args, conf.IPAM.ProvideOptions, conf.IPAM.RequestOptions) if err != nil { return err } diff --git a/plugins/ipam/dhcp/lease.go b/plugins/ipam/dhcp/lease.go index 0e9e72d2..6fc0ffa6 100644 --- a/plugins/ipam/dhcp/lease.go +++ b/plugins/ipam/dhcp/lease.go @@ -68,12 +68,12 @@ type DHCPLease struct { optsProviding map[dhcp4.OptionCode][]byte } -var acquireOptionsDefault = map[dhcp4.OptionCode]bool{ +var requestOptionsDefault = map[dhcp4.OptionCode]bool{ dhcp4.OptionRouter: true, dhcp4.OptionSubnetMask: true, } -func prepareOptions(cniArgs string, ProvideOptions []ProvideOption, RequireOptions []RequireOption) ( +func prepareOptions(cniArgs string, ProvideOptions []ProvideOption, RequestOptions []RequestOption) ( optsRequesting map[dhcp4.OptionCode]bool, optsProviding map[dhcp4.OptionCode][]byte, err error) { // parse CNI args @@ -113,7 +113,7 @@ func prepareOptions(cniArgs string, ProvideOptions []ProvideOption, RequireOptio // parse necessary options map optsRequesting = make(map[dhcp4.OptionCode]bool) skipRequireDefault := false - for _, opt := range RequireOptions { + for _, opt := range RequestOptions { if opt.SkipDefault { skipRequireDefault = true } @@ -124,7 +124,7 @@ func prepareOptions(cniArgs string, ProvideOptions []ProvideOption, RequireOptio } optsRequesting[optParsed] = true } - for k, v := range acquireOptionsDefault { + for k, v := range requestOptionsDefault { // only set if not skipping default and this value does not exists if _, ok := optsRequesting[k]; !ok && !skipRequireDefault { optsRequesting[k] = v diff --git a/plugins/ipam/dhcp/main.go b/plugins/ipam/dhcp/main.go index e8e2771f..be18aff4 100644 --- a/plugins/ipam/dhcp/main.go +++ b/plugins/ipam/dhcp/main.go @@ -48,9 +48,9 @@ type IPAMConfig struct { ProvideOptions []ProvideOption `json:"provide"` // When requesting IP from DHCP server, claiming these options are necessary. Options are necessary unless `optional` // is set to `false`. - // To override default required fields, set `skipDefault` to `false`. + // To override default requesting fields, set `skipDefault` to `false`. // If an field is not optional, but the server failed to provide it, error will be raised. - RequireOptions []RequireOption `json:"require"` + RequestOptions []RequestOption `json:"request"` } // DHCPOption represents a DHCP option. It can be a number, or a string defined in manual dhcp-options(5). @@ -64,7 +64,7 @@ type ProvideOption struct { ValueFromCNIArg string `json:"fromArg"` } -type RequireOption struct { +type RequestOption struct { SkipDefault bool `json:"skipDefault"` Option DHCPOption `json:"option"`