[pve-devel] [PATCH pve-network 0/7] add dhcp support for all zones

Alexandre Derumier aderumier at odiso.com
Tue Dec 19 09:32:09 CET 2023


This patch serie add dhcp support for all zones types.

also:
- Exec dnsmasq in a specific vrf if needed (currently only evpn)
- Enable-ra only on layer3 subnets



TO FIX:

- Dnsmasq is currently buggy with ipv6 && vrf (no crash but it's not listening), and need to be patched with:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=a889c554a7df71ff93a8299ef96037fbe05f2f55
I have tested it, just applying this patch on current debian source is enough to get is working.


- for layer2 network, we can't use a /128 for ipv6 like the /32 of ipv4.
  ipv6 range is large, so it shouldn't be a problem for user to have a free ip. (I can be the same on all vnets).
  But that mean we can't reuse the gateway ip (or it'll conflict).
  We need to be able to define a different ipv6 for dnsmasq server here. (and make it mandatory for ipv6 in this plugins)

- gateway should be optionnal (for user have 2 nic, 1 routable + 1 flat, we don't want to send 2 gateway).
  Use dnsmasq server ip field (like ipv6 layer 2 plugin ?) + empty gateway field
  don't announce ra for theses subnets (not sure how to handle this in dnsmasq range)


Alexandre Derumier (7):
  dhcp: add vrf support
  dhcp: enable-ra on layer3 zones only
  dnsmasq service: run service in vrf
  zones: evpn: add dhcp support
  zones: vlan: add dhcp support
  zones: qinq: add dhcp support
  zones: vxlan: add dhcp support

 src/PVE/Network/SDN/Dhcp.pm                   |  3 +-
 src/PVE/Network/SDN/Dhcp/Dnsmasq.pm           |  7 ++--
 src/PVE/Network/SDN/Zones.pm                  | 10 ++++++
 src/PVE/Network/SDN/Zones/EvpnPlugin.pm       |  9 +++++
 src/PVE/Network/SDN/Zones/Plugin.pm           |  7 ++++
 src/PVE/Network/SDN/Zones/QinQPlugin.pm       | 32 +++++++++++++++++
 src/PVE/Network/SDN/Zones/SimplePlugin.pm     |  9 +++++
 src/PVE/Network/SDN/Zones/VlanPlugin.pm       | 33 ++++++++++++++++++
 src/PVE/Network/SDN/Zones/VxlanPlugin.pm      | 32 +++++++++++++++++
 src/services/01-dnsmasq-vrf.conf              |  4 +++
 src/services/Makefile                         |  1 +
 .../zones/qinq/dhcp/expected_sdn_interfaces   | 34 +++++++++++++++++++
 src/test/zones/qinq/dhcp/interfaces           |  5 +++
 src/test/zones/qinq/dhcp/sdn_config           | 26 ++++++++++++++
 .../zones/qinq/nodhcp/expected_sdn_interfaces | 30 ++++++++++++++++
 src/test/zones/qinq/nodhcp/interfaces         |  5 +++
 src/test/zones/qinq/nodhcp/sdn_config         | 26 ++++++++++++++
 .../zones/vlan/dhcp/expected_sdn_interfaces   | 27 +++++++++++++++
 src/test/zones/vlan/dhcp/interfaces           |  5 +++
 src/test/zones/vlan/dhcp/sdn_config           | 27 +++++++++++++++
 .../zones/vlan/nodhcp/expected_sdn_interfaces | 23 +++++++++++++
 src/test/zones/vlan/nodhcp/interfaces         |  5 +++
 src/test/zones/vlan/nodhcp/sdn_config         | 27 +++++++++++++++
 .../zones/vxlan/dhcp/expected_sdn_interfaces  | 19 +++++++++++
 src/test/zones/vxlan/dhcp/interfaces          |  7 ++++
 src/test/zones/vxlan/dhcp/sdn_config          | 25 ++++++++++++++
 .../vxlan/nodhcp/expected_sdn_interfaces      | 15 ++++++++
 src/test/zones/vxlan/nodhcp/interfaces        |  7 ++++
 src/test/zones/vxlan/nodhcp/sdn_config        | 25 ++++++++++++++
 29 files changed, 481 insertions(+), 4 deletions(-)
 create mode 100644 src/services/01-dnsmasq-vrf.conf
 create mode 100644 src/test/zones/qinq/dhcp/expected_sdn_interfaces
 create mode 100644 src/test/zones/qinq/dhcp/interfaces
 create mode 100644 src/test/zones/qinq/dhcp/sdn_config
 create mode 100644 src/test/zones/qinq/nodhcp/expected_sdn_interfaces
 create mode 100644 src/test/zones/qinq/nodhcp/interfaces
 create mode 100644 src/test/zones/qinq/nodhcp/sdn_config
 create mode 100644 src/test/zones/vlan/dhcp/expected_sdn_interfaces
 create mode 100644 src/test/zones/vlan/dhcp/interfaces
 create mode 100644 src/test/zones/vlan/dhcp/sdn_config
 create mode 100644 src/test/zones/vlan/nodhcp/expected_sdn_interfaces
 create mode 100644 src/test/zones/vlan/nodhcp/interfaces
 create mode 100644 src/test/zones/vlan/nodhcp/sdn_config
 create mode 100644 src/test/zones/vxlan/dhcp/expected_sdn_interfaces
 create mode 100644 src/test/zones/vxlan/dhcp/interfaces
 create mode 100644 src/test/zones/vxlan/dhcp/sdn_config
 create mode 100644 src/test/zones/vxlan/nodhcp/expected_sdn_interfaces
 create mode 100644 src/test/zones/vxlan/nodhcp/interfaces
 create mode 100644 src/test/zones/vxlan/nodhcp/sdn_config

-- 
2.39.2




More information about the pve-devel mailing list