ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Incorporate Dan's comments.

Browse Source
This commit is contained in:
Tomofumi Hayashi 2018-09-05 14:37:31 +09:00
parent cc3ad26691
commit 60a99ca331
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/ipam/static/README.md
View File

@ -48,8 +48,7 @@ static IPAM is very simple IPAM plugin that assigns IPv4 and IPv6 addresses stat
The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/SPEC.md#parameters) are supported: The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/SPEC.md#parameters) are supported:
* `IP`: request a specific IP address * `IP`: request a specific CIDR notation IP address
* `SUBNET`: request a specific subnet
* `GATEWAY`: request a specific gateway address * `GATEWAY`: request a specific gateway address
(example: CNI_ARGS="IP=10.10.0.1;SUBNET=10.10.0.0/24;GATEWAY=10.10.0.254") (example: CNI_ARGS="IP=10.10.0.1/24;GATEWAY=10.10.0.254")

11
plugins/ipam/static/main.go
View File

@ -45,8 +45,7 @@ type IPAMConfig struct {
type IPAMEnvArgs struct { type IPAMEnvArgs struct {
types.CommonArgs types.CommonArgs
IP net.IP `json:"ip,omitempty"` IP types.UnmarshallableString `json:"ip,omitempty"`
SUBNET types.UnmarshallableString `json:"subnet,omitempty"`
GATEWAY net.IP `json:"gateway,omitempty"` GATEWAY net.IP `json:"gateway,omitempty"`
} }
@ -116,13 +115,13 @@ func LoadIPAMConfig(bytes []byte, envArgs string) (*IPAMConfig, string, error) {
return nil, "", err return nil, "", err
} }
if e.IP != nil && e.SUBNET != "" { if e.IP != "" {
_, subnet, err := net.ParseCIDR(string(e.SUBNET)) ip, subnet, err := net.ParseCIDR(string(e.IP))
if err != nil { if err != nil {
return nil, "", fmt.Errorf("invalid CIDR %s: %s", e.SUBNET, err) return nil, "", fmt.Errorf("invalid CIDR %s: %s", e.IP, err)
} }
addr := Address{Address: net.IPNet{IP: e.IP, Mask: subnet.Mask}} addr := Address{Address: net.IPNet{IP: ip, Mask: subnet.Mask}}
if e.GATEWAY != nil { if e.GATEWAY != nil {
addr.Gateway = e.GATEWAY addr.Gateway = e.GATEWAY
} }

2
plugins/ipam/static/static_test.go
View File

@ -176,7 +176,7 @@ var _ = Describe("static Operations", func() {
Netns: nspath, Netns: nspath,
IfName: ifname, IfName: ifname,
StdinData: []byte(conf), StdinData: []byte(conf),
Args: "IP=10.10.0.1;SUBNET=10.10.0.0/24;GATEWAY=10.10.0.254", Args: "IP=10.10.0.1/24;GATEWAY=10.10.0.254",
} }
// Allocate the IP // Allocate the IP