Merge "Make 'plugin' a required argument for '_get_vif_instance'"

This commit is contained in:
Zuul 2019-02-01 00:18:58 +00:00 committed by Gerrit Code Review
commit 5a4863aa15
1 changed files with 2 additions and 1 deletions

View File

@ -245,7 +245,7 @@ def _nova_to_osvif_network(network):
return netobj
def _get_vif_instance(vif, cls, **kwargs):
def _get_vif_instance(vif, cls, plugin, **kwargs):
"""Instantiate an os-vif VIF instance
:param vif: the nova.network.model.VIF instance
@ -261,6 +261,7 @@ def _get_vif_instance(vif, cls, **kwargs):
has_traffic_filtering=vif.is_neutron_filtering_enabled(),
preserve_on_delete=vif['preserve_on_delete'],
active=vif['active'],
plugin=plugin,
**kwargs)