openstack/os-vif
Code Issues Proposed changes

Fix logic getting access to stevedore loaded plugin instance

Browse Source 
The code was directly using the stevedore Extension class
instance, instead of accessing its 'obj' attribute to get
the actual loaded plugin class.

Change-Id: Ib4d9cdf4fe8fe88f13dbc4e81e0742521e6eb645
This commit is contained in:
Daniel P. Berrange 2016-01-27 15:52:26 +00:00
parent 992b409d9a
commit 7ae8163bc9
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_vif/__init__.py
View File

@ -86,7 +86,7 @@ def plug(vif, instance_info):
plugin_name = vif.plugin
try:
plugin = _EXT_MANAGER[plugin_name]
plugin = _EXT_MANAGER[plugin_name].obj
except KeyError:
raise os_vif.exception.NoMatchingPlugin(plugin_name=plugin_name)
@ -119,7 +119,7 @@ def unplug(vif, instance_info):
plugin_name = vif.plugin
try:
plugin = _EXT_MANAGER[plugin_name]
plugin = _EXT_MANAGER[plugin_name].obj
except KeyError:
raise os_vif.exception.NoMatchingPlugin(plugin_name=plugin_name)

11
os_vif/tests/test_os_vif.py
View File

@ -11,6 +11,7 @@
# under the License.
import mock
from stevedore import extension
import os_vif
from os_vif import exception
@ -58,7 +59,10 @@ class TestOSVIF(base.TestCase):
@mock.patch.object(DemoPlugin, "plug")
def test_plug(self, mock_plug):
plg = DemoPlugin()
plg = extension.Extension(name="demo",
entry_point="os-vif",
plugin="DemoPlugin",
obj=DemoPlugin())
with mock.patch('stevedore.extension.ExtensionManager',
return_value={'foobar': plg}):
os_vif.initialize()
@ -70,7 +74,10 @@ class TestOSVIF(base.TestCase):
@mock.patch.object(DemoPlugin, "unplug")
def test_unplug(self, mock_unplug):
plg = DemoPlugin()
plg = extension.Extension(name="demo",
entry_point="os-vif",
plugin="DemoPlugin",
obj=DemoPlugin())
with mock.patch('stevedore.extension.ExtensionManager',
return_value={'foobar': plg}):
os_vif.initialize()