openstack/nova
Code Issues Proposed changes

Merge "os-vif-util: set vif_name for vhostuser ovs os-vif port"

Browse Source
This commit is contained in:
Jenkins
2017-01-20 20:47:05 +00:00
committed by Gerrit Code Review
parent 6a2c62ddc0 cf3ff761ff
commit b08033f5e4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/network/os_vif_util.py
View File

@@ -284,8 +284,10 @@ def _nova_to_osvif_vif_vhostuser(vif):
if vif['details'].get(model.VIF_DETAILS_VHOSTUSER_OVS_PLUG, False): if vif['details'].get(model.VIF_DETAILS_VHOSTUSER_OVS_PLUG, False):
profile = objects.vif.VIFPortProfileOpenVSwitch( profile = objects.vif.VIFPortProfileOpenVSwitch(
interface_id=vif.get('ovs_interfaceid') or vif['id']) interface_id=vif.get('ovs_interfaceid') or vif['id'])
vif_name = ('vhu' + vif['id'])[:model.NIC_NAME_LEN]
obj = _get_vif_instance(vif, objects.vif.VIFVHostUser, obj = _get_vif_instance(vif, objects.vif.VIFVHostUser,
port_profile=profile, plugin="ovs") port_profile=profile, plugin="ovs",
vif_name=vif_name)
if vif["network"]["bridge"] is not None: if vif["network"]["bridge"] is not None:
obj.bridge_name = vif["network"]["bridge"] obj.bridge_name = vif["network"]["bridge"]
obj.mode = vif['details'].get( obj.mode = vif['details'].get(

1
nova/tests/unit/network/test_os_vif_util.py
View File

@@ -572,6 +572,7 @@ class OSVIFUtilTestCase(test.NoDBTestCase):
plugin="ovs", plugin="ovs",
port_profile=osv_objects.vif.VIFPortProfileOpenVSwitch( port_profile=osv_objects.vif.VIFPortProfileOpenVSwitch(
interface_id="dc065497-3c8d-4f44-8fb4-e1d33c16a536"), interface_id="dc065497-3c8d-4f44-8fb4-e1d33c16a536"),
vif_name="vhudc065497-3c",
path='/fake/socket', path='/fake/socket',
mode='client', mode='client',
has_traffic_filtering=True, has_traffic_filtering=True,