openstack/nova
Code Issues Proposed changes

Merge "make unit tests compatible with os-vif 1.8.0"

Browse Source
This commit is contained in:
Zuul 2018-01-17 18:15:35 +00:00 committed by Gerrit Code Review
commit 4f26e91a0b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -499,7 +499,8 @@ class OSVIFUtilTestCase(test.NoDBTestCase):
has_traffic_filtering=True, has_traffic_filtering=True,
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",
datapath_type=None),
preserve_on_delete=False, preserve_on_delete=False,
vif_name="nicdc065497-3c", vif_name="nicdc065497-3c",
network=osv_objects.network.Network( network=osv_objects.network.Network(
@ -661,7 +662,8 @@ class OSVIFUtilTestCase(test.NoDBTestCase):
plugin="ovs", plugin="ovs",
bridge_name="qbrdc065497-3c", bridge_name="qbrdc065497-3c",
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",
datapath_type="system"),
preserve_on_delete=False, preserve_on_delete=False,
vif_name="nicdc065497-3c", vif_name="nicdc065497-3c",
network=osv_objects.network.Network( network=osv_objects.network.Network(