x/vmware-nsx
Code Issues Proposed changes

Handle VLAN interfaces with Linux IP wrapper

Browse Source 
Check if the interface name contains '@' character and use the part
before that character as interface name.

Change-Id: I09eb52f4d41054a76fd140d3a3476c6cfe05226b
Closes-Bug: #1240125
This commit is contained in:
Édouard Thuleau 2013-10-15 15:41:32 +00:00
parent 6078653d8b
commit 05c69ac6e6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/ip_lib.py
View File

@ -94,7 +94,7 @@ class IPWrapper(SubProcessBase):
continue continue
tokens = line.split(':', 2) tokens = line.split(':', 2)
if len(tokens) >= 3: if len(tokens) >= 3:
name = tokens[1].strip() name = tokens[1].split('@', 1)[0].strip()
if exclude_loopback and name == LOOPBACK_DEVNAME: if exclude_loopback and name == LOOPBACK_DEVNAME:
continue continue

11
neutron/tests/unit/test_linux_ip_lib.py
View File

@ -35,7 +35,10 @@ LINK_SAMPLE = [
'3: br-int: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN ' '3: br-int: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN '
'\ link/ether aa:bb:cc:dd:ee:ff brd ff:ff:ff:ff:ff:ff', '\ link/ether aa:bb:cc:dd:ee:ff brd ff:ff:ff:ff:ff:ff',
'4: gw-ddc717df-49: <BROADCAST,MULTICAST> mtu 1500 qdisc noop ' '4: gw-ddc717df-49: <BROADCAST,MULTICAST> mtu 1500 qdisc noop '
'state DOWN \ link/ether fe:dc:ba:fe:dc:ba brd ff:ff:ff:ff:ff:ff'] 'state DOWN \ link/ether fe:dc:ba:fe:dc:ba brd ff:ff:ff:ff:ff:ff',
'5: eth0.50@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc '
' noqueue master brq0b24798c-07 state UP mode DEFAULT'
'\ link/ether ab:04:49:b6:ab:a0 brd ff:ff:ff:ff:ff:ff']
ADDR_SAMPLE = (""" ADDR_SAMPLE = ("""
2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP qlen 1000 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP qlen 1000
@ -164,7 +167,8 @@ class TestIpWrapper(base.BaseTestCase):
[ip_lib.IPDevice('lo'), [ip_lib.IPDevice('lo'),
ip_lib.IPDevice('eth0'), ip_lib.IPDevice('eth0'),
ip_lib.IPDevice('br-int'), ip_lib.IPDevice('br-int'),
ip_lib.IPDevice('gw-ddc717df-49')]) ip_lib.IPDevice('gw-ddc717df-49'),
ip_lib.IPDevice('eth0.50')])
self.execute.assert_called_once_with('o', 'link', ('list',), self.execute.assert_called_once_with('o', 'link', ('list',),
'sudo', None) 'sudo', None)
@ -176,7 +180,8 @@ class TestIpWrapper(base.BaseTestCase):
[ip_lib.IPDevice('lo'), [ip_lib.IPDevice('lo'),
ip_lib.IPDevice('eth0'), ip_lib.IPDevice('eth0'),
ip_lib.IPDevice('br-int'), ip_lib.IPDevice('br-int'),
ip_lib.IPDevice('gw-ddc717df-49')]) ip_lib.IPDevice('gw-ddc717df-49'),
ip_lib.IPDevice('eth0.50')])
self.execute.assert_called_once_with('o', 'link', ('list',), self.execute.assert_called_once_with('o', 'link', ('list',),
'sudo', None) 'sudo', None)