Repository navigation
Commit 49fe545
bridge: skip the IPAM CHECK when no IPAM plugin is configured
A bridge config without an ipam type is an L2-only network. ADD, DEL
and STATUS already skip IPAM for it, but CHECK always called the IPAM
plugin with an empty name and failed with "no plugin name provided"
for a healthy L2-only bridge.
Only call the IPAM plugin in CHECK when an ipam type is set, as macvlan,
ipvlan, tap and host-device do. The remaining prevResult checks still
run.
Add an ADD/DEL/CHECK spec for an L2-only bridge and let
cmdAddDelCheckTest skip the host-local config load for it.
Signed-off-by: spicysharkco <321699413+spicysharkco@users.noreply.github.com>1 parent f63af46 commit 49fe545
2 files changed
Lines changed: 20 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1016 | 1016 | | |
1017 | 1017 | | |
1018 | 1018 | | |
1019 | | - | |
1020 | | - | |
1021 | | - | |
1022 | | - | |
| 1019 | + | |
| 1020 | + | |
| 1021 | + | |
| 1022 | + | |
| 1023 | + | |
| 1024 | + | |
| 1025 | + | |
| 1026 | + | |
1023 | 1027 | | |
1024 | 1028 | | |
1025 | 1029 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1835 | 1835 | | |
1836 | 1836 | | |
1837 | 1837 | | |
1838 | | - | |
1839 | | - | |
| 1838 | + | |
| 1839 | + | |
| 1840 | + | |
| 1841 | + | |
1840 | 1842 | | |
1841 | 1843 | | |
1842 | 1844 | | |
| |||
2718 | 2720 | | |
2719 | 2721 | | |
2720 | 2722 | | |
| 2723 | + | |
| 2724 | + | |
| 2725 | + | |
| 2726 | + | |
| 2727 | + | |
| 2728 | + | |
| 2729 | + | |
| 2730 | + | |
2721 | 2731 | | |
2722 | 2732 | | |
2723 | 2733 | | |
| |||
0 commit comments