summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadoslav Gerganov <rgerganov@vmware.com>2016-12-21 14:35:41 +0200
committerRadoslav Gerganov <rgerganov@vmware.com>2016-12-21 17:40:49 +0200
commitc9357e86777780c7f1e639bc855d725d1600b284 (patch)
tree5b1522b8fbd963eb3e39d5e895f7027a86805fa2
parent9b7e1deb2c25970968e9508f8856a39c895cb2f0 (diff)
downloadoslo-vmware-c9357e86777780c7f1e639bc855d725d1600b284.tar.gz
Remove some useless log messages
'Waiting for function _invoke_api to return' doesn't give any information and only makes log files hard to read. Also reduce logging when polling NFC leases. Change-Id: I08653a0f529a186405695cbcfb9fc9018c93f856
-rw-r--r--oslo_vmware/api.py5
-rw-r--r--oslo_vmware/tests/test_api.py11
2 files changed, 9 insertions, 7 deletions
diff --git a/oslo_vmware/api.py b/oslo_vmware/api.py
index ed3a553..e6c3f1c 100644
--- a/oslo_vmware/api.py
+++ b/oslo_vmware/api.py
@@ -119,7 +119,6 @@ class RetryDecorator(object):
def func(*args, **kwargs):
loop = loopingcall.DynamicLoopingCall(_func, *args, **kwargs)
evt = loop.start(periodic_interval_max=self._max_sleep_time)
- LOG.debug("Waiting for function %s to return.", func_name)
return evt.wait()
return func
@@ -463,13 +462,13 @@ class VMwareAPISession(object):
:param lease: lease whose state is to be polled
"""
- LOG.debug("Invoking VIM API to read state of lease: %s.", lease)
try:
state = self.invoke_api(vim_util,
'get_object_property',
self.vim,
lease,
- 'state')
+ 'state',
+ skip_op_id=True)
except exceptions.VimException:
with excutils.save_and_reraise_exception():
LOG.exception(_LE("Error occurred while checking "
diff --git a/oslo_vmware/tests/test_api.py b/oslo_vmware/tests/test_api.py
index 9a002bd..3cdfe83 100644
--- a/oslo_vmware/tests/test_api.py
+++ b/oslo_vmware/tests/test_api.py
@@ -474,7 +474,8 @@ class VMwareAPISessionTest(base.TestCase):
api_session.invoke_api.assert_called_with(vim_util,
'get_object_property',
api_session.vim, lease,
- 'state')
+ 'state',
+ skip_op_id=True)
self.assertEqual(num_states, api_session.invoke_api.call_count)
def test_wait_for_lease_ready_with_error_state(self):
@@ -491,7 +492,8 @@ class VMwareAPISessionTest(base.TestCase):
api_session.wait_for_lease_ready,
lease)
exp_calls = [mock.call(vim_util, 'get_object_property',
- api_session.vim, lease, 'state')] * 2
+ api_session.vim, lease, 'state',
+ skip_op_id=True)] * 2
exp_calls.append(mock.call(vim_util, 'get_object_property',
api_session.vim, lease, 'error'))
self.assertEqual(exp_calls, api_session.invoke_api.call_args_list)
@@ -510,7 +512,8 @@ class VMwareAPISessionTest(base.TestCase):
api_session.invoke_api.assert_called_once_with(vim_util,
'get_object_property',
api_session.vim,
- lease, 'state')
+ lease, 'state',
+ skip_op_id=True)
def test_wait_for_lease_ready_with_invoke_api_exception(self):
api_session = self._create_api_session(True)
@@ -522,7 +525,7 @@ class VMwareAPISessionTest(base.TestCase):
lease)
api_session.invoke_api.assert_called_once_with(
vim_util, 'get_object_property', api_session.vim, lease,
- 'state')
+ 'state', skip_op_id=True)
def _poll_task_well_known_exceptions(self, fault,
expected_exception):