Skip to content

vxlan: Add support for IPv6 vxlan-local-tunnelip #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wido wants to merge 1 commit into
base: master
Choose a base branch
from
Open

vxlan: Add support for IPv6 vxlan-local-tunnelip #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ifupdown2/addons/vxlan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class vxlan(Vxlan, moduleBase):
},
"vxlan-local-tunnelip": {
"help": "vxlan local tunnel ip",
"validvals": ["<ipv4>"],
"validvals": ["<ipv4>", "<ipv6>"],
"example": ["vxlan-local-tunnelip 172.16.20.103"]
},
"vxlan-svcnodeip": {
Expand Down Expand Up @@ -547,7 +547,7 @@ def __config_vxlan_local_tunnelip(self, ifname, ifaceobj, link_exists, user_requ

if local:
try:
local = ipnetwork.IPv4Address(local)
local = ipnetwork.IPAddress(local)

if local.initialized_with_prefixlen:
self.logger.warning("%s: vxlan-local-tunnelip %s: netmask ignored" % (ifname, local))
Expand Down Expand Up @@ -1173,7 +1173,8 @@ def _up(self, ifaceobj):
vxlan_physdev,
user_request_vxlan_info_data.get(Link.IFLA_VXLAN_PORT),
vxlan_vnifilter,
vxlan_ttl
vxlan_ttl,
local.version
)
elif ifaceobj.link_privflags & ifaceLinkPrivFlags.L3VXI:
self.iproute2.link_add_l3vxi(
Expand All @@ -1183,7 +1184,8 @@ def _up(self, ifaceobj):
group.ip if group else None,
vxlan_physdev,
user_request_vxlan_info_data.get(Link.IFLA_VXLAN_PORT),
vxlan_ttl
vxlan_ttl,
local.version
)
else:
try:
Expand Down Expand Up @@ -1235,7 +1237,7 @@ def _up(self, ifaceobj):
if remoteips:
try:
for remoteip in remoteips:
ipnetwork.IPv4Address(remoteip)
ipnetwork.IPAddress(remoteip)
except Exception as e:
self.log_error('%s: vxlan-remoteip: %s' % (ifaceobj.name, str(e)))

Expand Down
22 changes: 16 additions & 6 deletions ifupdown2/lib/iproute2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,17 +280,22 @@ def link_add_veth(self, ifname, peer_name):

###

def link_add_single_vxlan(self, link_exists, ifname, ip, group, physdev, port, vnifilter="off", ttl=None):
def link_add_single_vxlan(self, link_exists, ifname, ip, group, physdev, port, vnifilter="off", ttl=None, ipversion=4):
self.logger.info("creating single vxlan device: %s" % ifname)

cmd = []

if ipversion == 6:
cmd.append("-6")

if link_exists:
# When updating an SVD we need to use `ip link set` and we have to
# drop the external keyword:
# $ ip link set dev vxlan0 type vxlan external local 27.0.0.242 dev ipmr-lo
# Error: vxlan: cannot change COLLECT_METADATA flag.
cmd = ["link set dev %s type vxlan" % ifname]
cmd.append("link set dev %s type vxlan" % ifname)
else:
cmd = ["link add dev %s type vxlan external" % ifname]
cmd.append("link add dev %s type vxlan external" % ifname)

# when changing local ip, if we specify vnifilter we get:
# Error: vxlan: cannot change flag.
Expand All @@ -316,17 +321,22 @@ def link_add_single_vxlan(self, link_exists, ifname, ip, group, physdev, port, v
self.__execute_or_batch(utils.ip_cmd, " ".join(cmd))
self.__update_cache_after_link_creation(ifname, "vxlan")

def link_add_l3vxi(self, link_exists, ifname, ip, group, physdev, port, ttl=None):
def link_add_l3vxi(self, link_exists, ifname, ip, group, physdev, port, ttl=None, ipversion=4):
self.logger.info("creating l3vxi device: %s" % ifname)

cmd = []

if ipversion == 6:
cmd.append("-6")

if link_exists:
# When updating an SVD we need to use `ip link set` and we have to
# drop the external keyword:
# $ ip link set dev vxlan0 type vxlan external local 27.0.0.242 dev ipmr-lo
# Error: vxlan: cannot change COLLECT_METADATA flag.
cmd = ["link set dev %s type vxlan" % ifname]
cmd.append("link set dev %s type vxlan" % ifname)
else:
cmd = ["link add dev %s type vxlan external vnifilter" % ifname]
cmd.append("link add dev %s type vxlan external vnifilter" % ifname)
# when changing local ip, if we specify vnifilter we get:
# Error: vxlan: cannot change flag.
# So we are only setting this attribute on vxlan creation
Expand Down