From c32d2a6e677696edc19e7b69023ba781a5d22d72 Mon Sep 17 00:00:00 2001 From: Sergey Belous Date: Fri, 19 Feb 2016 16:38:23 +0300 Subject: [PATCH] Use names() method of ExtensionManager insted of keys() There is no keys() method for ExtensionManager. The names() method [1] must be used. [1] http://docs.openstack.org/developer/stevedore/managers.html#stevedore.extension.ExtensionManager.names Change-Id: I4177d076733abe6b855d8fbf1c2633097de1fe84 --- os_vif/__init__.py | 2 +- os_vif/tests/test_os_vif.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/os_vif/__init__.py b/os_vif/__init__.py index 968cfcc..2dac738 100644 --- a/os_vif/__init__.py +++ b/os_vif/__init__.py @@ -37,7 +37,7 @@ def initialize(reset=False): if reset or (_EXT_MANAGER is None): _EXT_MANAGER = extension.ExtensionManager(namespace='os_vif', invoke_on_load=False) - for plugin_name in _EXT_MANAGER.keys(): + for plugin_name in _EXT_MANAGER.names(): cls = _EXT_MANAGER[plugin_name].plugin obj = cls.load(plugin_name) _EXT_MANAGER[plugin_name].obj = obj diff --git a/os_vif/tests/test_os_vif.py b/os_vif/tests/test_os_vif.py index ce0f3e2..dcf6ce3 100644 --- a/os_vif/tests/test_os_vif.py +++ b/os_vif/tests/test_os_vif.py @@ -103,8 +103,10 @@ class TestOSVIF(base.TestCase): entry_point="os-vif", plugin=DemoPlugin, obj=None) - with mock.patch('stevedore.extension.ExtensionManager', - return_value={'foobar': plg}): + with mock.patch('stevedore.extension.ExtensionManager.names', + return_value=['foobar']),\ + mock.patch('stevedore.extension.ExtensionManager.__getitem__', + return_value=plg): os_vif.initialize() info = objects.instance_info.InstanceInfo() vif = objects.vif.VIFBridge(id='uniq', @@ -118,8 +120,10 @@ class TestOSVIF(base.TestCase): entry_point="os-vif", plugin=DemoPlugin, obj=None) - with mock.patch('stevedore.extension.ExtensionManager', - return_value={'foobar': plg}): + with mock.patch('stevedore.extension.ExtensionManager.names', + return_value=['foobar']),\ + mock.patch('stevedore.extension.ExtensionManager.__getitem__', + return_value=plg): os_vif.initialize() info = objects.instance_info.InstanceInfo() vif = objects.vif.VIFBridge(id='uniq',