mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

addons: bridge: disabling ipv6 on bridge if any VXLAN port

Browse Source 
Ticket: CM-7594
Reviewed By: Roopa
Testing Done: Creating a bridge with and without vxlan
This commit is contained in:
Julien Fortin
2016-04-25 00:32:59 +02:00
parent c8a3b44e94
commit ea9e3c0f15
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ifupdown/iface.py
View File

@@ -56,11 +56,12 @@ class ifaceLinkKind():
class ifaceLinkPrivFlags():
""" This corresponds to kernel netdev->priv_flags
and can be BRIDGE_PORT, BOND_SLAVE etc """
UNKNOWN = 0x0000
BRIDGE_PORT = 0x0001
BOND_SLAVE = 0x0010
VRF_SLAVE = 0x0100
BRIDGE_VLAN_AWARE = 0x1000
UNKNOWN = 0x00000
BRIDGE_PORT = 0x00001
BOND_SLAVE = 0x00010
VRF_SLAVE = 0x00100
BRIDGE_VLAN_AWARE = 0x01000
BRIDGE_VXLAN = 0x10000
@classmethod
def get_str(cls, flag):
@@ -74,18 +75,22 @@ class ifaceLinkPrivFlags():
return 'vrf slave'
elif flag == cls.BRIDGE_VLAN_AWARE:
return 'vlan aware bridge'
elif flag == cls.BRIDGE_VXLAN:
return 'vxlan bridge'
@classmethod
def get_all_str(cls, flags):
str = ''
if (flags & cls.BRIDGE_PORT):
if flags & cls.BRIDGE_PORT:
str += 'bridgeport '
if (flags == cls.BOND_SLAVE):
if flags & cls.BOND_SLAVE:
str += 'bondslave '
elif flags == cls.VRF_SLAVE:
if flags & cls.VRF_SLAVE:
str += 'vrfslave '
elif flags == cls.BRIDGE_VLAN_AWARE:
if flags & cls.BRIDGE_VLAN_AWARE:
str += 'vlanawarebridge '
if flags & cls.BRIDGE_VXLAN:
str += 'vxlanbridge '
return str
class ifaceLinkType():

4
ifupdown/ifupdownmain.py
View File

@@ -448,6 +448,10 @@ class ifupdownMain(ifupdownBase):
self._set_iface_role(ifaceobj, ifaceRole.SLAVE, upperifaceobj)
ifaceobj.link_privflags |= ifaceLinkPrivFlags.BRIDGE_PORT
if (ifaceobj.link_kind & ifaceLinkKind.VXLAN) \
and (upperifaceobj.link_kind & ifaceLinkKind.BRIDGE):
upperifaceobj.link_privflags |= ifaceLinkPrivFlags.BRIDGE_VXLAN
# vrf masters get processed after slaves, which means
# check both link_kind vrf and vrf slave
if ((upperifaceobj.link_kind & ifaceLinkKind.VRF) or