openstack/nova
Code Issues Proposed changes

Merge "Assign mac address to vf netdevice when using macvtap port"

Browse Source
This commit is contained in:
Jenkins
2017-02-09 14:17:01 +00:00
committed by Gerrit Code Review
parent 70038388fb d79e3afc4c
commit c42a7e172b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/network/linux_net.py
View File

@@ -1903,7 +1903,11 @@ def set_vf_interface_vlan(pci_addr, mac_addr, vlan=0):
run_as_root=True, run_as_root=True,
check_exit_code=exit_code) check_exit_code=exit_code)
# Bring up/down the VF's interface # Bring up/down the VF's interface
# TODO(edand): The mac is assigned as a workaround for the following issue
# https://bugzilla.redhat.com/show_bug.cgi?id=1372944
# once resolved it will be removed
utils.execute('ip', 'link', 'set', vf_ifname, utils.execute('ip', 'link', 'set', vf_ifname,
'address', mac_addr,
port_state, port_state,
run_as_root=True, run_as_root=True,
check_exit_code=exit_code) check_exit_code=exit_code)

4
nova/tests/unit/virt/libvirt/test_vif.py
View File

@@ -839,7 +839,9 @@ class LibvirtVifTestCase(test.NoDBTestCase):
run_as_root=True, run_as_root=True,
check_exit_code=exit_code), check_exit_code=exit_code),
mock.call('ip', 'link', 'set', mock.call('ip', 'link', 'set',
'eth13', port_state, 'eth13', 'address',
self.vif_hw_veb_macvtap['address'],
port_state,
run_as_root=True, run_as_root=True,
check_exit_code=exit_code)] check_exit_code=exit_code)]
} }