diff options
| author | Vipin Balachandran <vbala@vmware.com> | 2017-07-10 16:40:19 -0700 |
|---|---|---|
| committer | Vipin Balachandran <vbala@vmware.com> | 2017-07-10 17:32:04 -0700 |
| commit | ad8274cb8f4c5534b28aafdb06b40a2edc0447dc (patch) | |
| tree | e00e7354b0bac3a50ccc133e543b7985b8bf57f9 | |
| parent | c5aed4fe30a3e3d9e82ca57015668cedc1394ed1 (diff) | |
| download | oslo-vmware-ad8274cb8f4c5534b28aafdb06b40a2edc0447dc.tar.gz | |
Use request_handler() for ExtensionManager APIs
Modifying find_extension() and register_extension() in vim_util
to use request_handler() in service module. Currently these
methods call vSphere APIs directly and hence suds web faults
are not translated.
Change-Id: Ic0ef099a3c94962bb6895473dcdf69e66112e482
Closes-bug: 1703478
| -rw-r--r-- | oslo_vmware/tests/test_vim_util.py | 8 | ||||
| -rw-r--r-- | oslo_vmware/vim_util.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oslo_vmware/tests/test_vim_util.py b/oslo_vmware/tests/test_vim_util.py index 1b7d4fd..c5c20fe 100644 --- a/oslo_vmware/tests/test_vim_util.py +++ b/oslo_vmware/tests/test_vim_util.py @@ -369,16 +369,16 @@ class VimUtilTest(base.TestCase): ret = vim_util.find_extension(vim, 'fake-key') self.assertIsNotNone(ret) service_content = vim.service_content - vim.client.service.FindExtension.assert_called_once_with( - service_content.extensionManager, 'fake-key') + vim.FindExtension.assert_called_once_with( + service_content.extensionManager, extensionKey='fake-key') def test_register_extension(self): vim = mock.Mock() ret = vim_util.register_extension(vim, 'fake-key', 'fake-type') self.assertIsNone(ret) service_content = vim.service_content - vim.client.service.RegisterExtension.assert_called_once_with( - service_content.extensionManager, mock.ANY) + vim.RegisterExtension.assert_called_once_with( + service_content.extensionManager, extension=mock.ANY) def test_get_vc_version(self): session = mock.Mock() diff --git a/oslo_vmware/vim_util.py b/oslo_vmware/vim_util.py index 6269016..f56f338 100644 --- a/oslo_vmware/vim_util.py +++ b/oslo_vmware/vim_util.py @@ -454,7 +454,7 @@ def find_extension(vim, key): :returns: the data object Extension or None """ extension_manager = vim.service_content.extensionManager - return vim.client.service.FindExtension(extension_manager, key) + return vim.FindExtension(extension_manager, extensionKey=key) def register_extension(vim, key, type, label='OpenStack', @@ -483,7 +483,7 @@ def register_extension(vim, key, type, label='OpenStack', desc.summary = summary os_ext.description = desc os_ext.lastHeartbeatTime = timeutils.utcnow().isoformat() - vim.client.service.RegisterExtension(extension_manager, os_ext) + vim.RegisterExtension(extension_manager, extension=os_ext) def get_vc_version(session): |