diff options
| -rw-r--r-- | ceilometer/compute/virt/vmware/inspector.py | 8 | ||||
| -rw-r--r-- | ceilometer/tests/compute/virt/vmware/test_inspector.py | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ceilometer/compute/virt/vmware/inspector.py b/ceilometer/compute/virt/vmware/inspector.py index 8a891855..f3e9d81f 100644 --- a/ceilometer/compute/virt/vmware/inspector.py +++ b/ceilometer/compute/virt/vmware/inspector.py @@ -17,7 +17,6 @@ from oslo.config import cfg from oslo.vmware import api -from oslo.vmware import vim from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt.vmware import vsphere_operations @@ -61,15 +60,12 @@ VC_DISK_WRITE_REQUESTS_RATE_CNTR = "disk:numberWriteAveraged:average" def get_api_session(): - hostIp = cfg.CONF.vmware.host_ip - wsdl_loc = vim.Vim._get_wsdl_loc("https", hostIp) api_session = api.VMwareAPISession( - hostIp, + cfg.CONF.vmware.host_ip, cfg.CONF.vmware.host_username, cfg.CONF.vmware.host_password, cfg.CONF.vmware.api_retry_count, - cfg.CONF.vmware.task_poll_interval, - wsdl_loc=wsdl_loc) + cfg.CONF.vmware.task_poll_interval) return api_session diff --git a/ceilometer/tests/compute/virt/vmware/test_inspector.py b/ceilometer/tests/compute/virt/vmware/test_inspector.py index 56b1f351..d5ee4c85 100644 --- a/ceilometer/tests/compute/virt/vmware/test_inspector.py +++ b/ceilometer/tests/compute/virt/vmware/test_inspector.py @@ -31,7 +31,6 @@ class TestVsphereInspection(test.BaseTestCase): api_session = api.VMwareAPISession("test_server", "test_user", "test_password", 0, None, create_session=False) - api_session._vim = mock.MagicMock() vsphere_inspector.get_api_session = mock.Mock( return_value=api_session) self._inspector = vsphere_inspector.VsphereInspector() |