openstack/ceilometer
Code Issues Proposed changes

compute: remove default duration value

Browse Source 
The default duration value is used only in test.
We can miss bug when test have a small diff with runtime.

So this change removes the default duration at runtime and fixes the
tests.

Change-Id: I2637facbd67fb81b995e9c9a7e4c092acfa06fcb
This commit is contained in:
Mehdi Abaakouk
2017-03-31 10:26:42 +02:00
parent 1e473dd45d
commit f21a4bcb26
8 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ceilometer/compute/virt/hyperv/inspector.py
View File

@@ -91,7 +91,7 @@ class HyperVInspector(virt_inspector.Inspector):
return float(host_cpu_clock * host_cpu_count)
def inspect_instance(self, instance, duration=None):
def inspect_instance(self, instance, duration):
instance_name = util.instance_name(instance)
(cpu_clock_used,
cpu_count, uptime) = self._utils.get_cpu_metrics(instance_name)
@@ -105,7 +105,7 @@ class HyperVInspector(virt_inspector.Inspector):
cpu_time=cpu_time,
memory_usage=memory_usage)
def inspect_vnics(self, instance, duration=None):
def inspect_vnics(self, instance, duration):
instance_name = util.instance_name(instance)
for vnic_metrics in self._utils.get_vnic_metrics(instance_name):
yield virt_inspector.InterfaceStats(
@@ -122,7 +122,7 @@ class HyperVInspector(virt_inspector.Inspector):
tx_drop=0,
tx_errors=0)
def inspect_disks(self, instance, duration=None):
def inspect_disks(self, instance, duration):
instance_name = util.instance_name(instance)
for disk_metrics in self._utils.get_disk_metrics(instance_name):
yield virt_inspector.DiskStats(
@@ -134,7 +134,7 @@ class HyperVInspector(virt_inspector.Inspector):
write_bytes=disk_metrics['write_mb'] * units.Mi,
errors=0)
def inspect_disk_latency(self, instance, duration=None):
def inspect_disk_latency(self, instance, duration):
instance_name = util.instance_name(instance)
for disk_metrics in self._utils.get_disk_latency_metrics(
instance_name):
@@ -142,7 +142,7 @@ class HyperVInspector(virt_inspector.Inspector):
device=disk_metrics['instance_id'],
disk_latency=disk_metrics['disk_latency'] / 1000)
def inspect_disk_iops(self, instance, duration=None):
def inspect_disk_iops(self, instance, duration):
instance_name = util.instance_name(instance)
for disk_metrics in self._utils.get_disk_iops_count(instance_name):
yield virt_inspector.DiskIOPSStats(

6
ceilometer/compute/virt/libvirt/inspector.py
View File

@@ -76,7 +76,7 @@ class LibvirtInspector(virt_inspector.Inspector):
return domain
@libvirt_utils.retry_on_disconnect
def inspect_vnics(self, instance, duration=None):
def inspect_vnics(self, instance, duration):
domain = self._get_domain_not_shut_off_or_raise(instance)
tree = etree.fromstring(domain.XMLDesc(0))
@@ -112,7 +112,7 @@ class LibvirtInspector(virt_inspector.Inspector):
tx_errors=dom_stats[7])
@libvirt_utils.retry_on_disconnect
def inspect_disks(self, instance, duration=None):
def inspect_disks(self, instance, duration):
domain = self._get_domain_not_shut_off_or_raise(instance)
tree = etree.fromstring(domain.XMLDesc(0))
@@ -129,7 +129,7 @@ class LibvirtInspector(virt_inspector.Inspector):
errors=block_stats[4])
@libvirt_utils.retry_on_disconnect
def inspect_disk_info(self, instance, duration=None):
def inspect_disk_info(self, instance, duration):
domain = self._get_domain_not_shut_off_or_raise(instance)
tree = etree.fromstring(domain.XMLDesc(0))
for disk in tree.findall('devices/disk'):

6
ceilometer/compute/virt/vmware/inspector.py
View File

@@ -114,7 +114,7 @@ class VsphereInspector(virt_inspector.Inspector):
return vm_mobj
def inspect_vnic_rates(self, instance, duration=None):
def inspect_vnic_rates(self, instance, duration):
vm_mobj = self._get_vm_mobj_not_power_off_or_raise(instance)
vnic_stats = {}
@@ -148,7 +148,7 @@ class VsphereInspector(virt_inspector.Inspector):
rx_bytes_rate=rx_bytes_rate,
tx_bytes_rate=tx_bytes_rate)
def inspect_disk_rates(self, instance, duration=None):
def inspect_disk_rates(self, instance, duration):
vm_mobj = self._get_vm_mobj_not_power_off_or_raise(instance)
disk_stats = {}
@@ -181,7 +181,7 @@ class VsphereInspector(virt_inspector.Inspector):
write_requests_rate=stat_val(VC_DISK_WRITE_REQUESTS_RATE_CNTR)
)
def inspect_instance(self, instance, duration=None):
def inspect_instance(self, instance, duration):
vm_mobj = self._get_vm_mobj_not_power_off_or_raise(instance)
cpu_util_counter_id = self._ops.get_perf_counter_id(
VC_AVERAGE_CPU_CONSUMED_CNTR)

8
ceilometer/compute/virt/xenapi/inspector.py
View File

@@ -133,7 +133,7 @@ class XenapiInspector(virt_inspector.Inspector):
else:
return vm_refs[0]
def inspect_instance(self, instance, duration=None):
def inspect_instance(self, instance, duration):
instance_name = util.instance_name(instance)
vm_ref = self._lookup_by_name(instance_name)
cpu_util = self._get_cpu_usage(vm_ref, instance_name)
@@ -171,7 +171,7 @@ class XenapiInspector(virt_inspector.Inspector):
# converting it to MB.
return (total_mem - free_mem * units.Ki) / units.Mi
def inspect_vnics(self, instance, duration=None):
def inspect_vnics(self, instance, duration):
instance_name = util.instance_name(instance)
vm_ref = self._lookup_by_name(instance_name)
dom_id = self._call_xenapi("VM.get_domid", vm_ref)
@@ -194,7 +194,7 @@ class XenapiInspector(virt_inspector.Inspector):
rx_errors=-1, tx_bytes=bw_vif['bw_out'], tx_packets=-1,
tx_drop=-1, tx_errors=-1)
def inspect_vnic_rates(self, instance, duration=None):
def inspect_vnic_rates(self, instance, duration):
instance_name = util.instance_name(instance)
vm_ref = self._lookup_by_name(instance_name)
vif_refs = self._call_xenapi("VM.get_VIFs", vm_ref)
@@ -217,7 +217,7 @@ class XenapiInspector(virt_inspector.Inspector):
rx_bytes_rate=rx_rate,
tx_bytes_rate=tx_rate)
def inspect_disk_rates(self, instance, duration=None):
def inspect_disk_rates(self, instance, duration):
instance_name = util.instance_name(instance)
vm_ref = self._lookup_by_name(instance_name)
vbd_refs = self._call_xenapi("VM.get_VBDs", vm_ref)

18
ceilometer/tests/unit/compute/virt/hyperv/test_inspector.py
View File

@@ -44,19 +44,19 @@ class TestHyperVInspection(base.BaseTestCase):
os_win_exc.OSWinException)
self.assertRaises(virt_inspector.InspectorException,
self._inspector.inspect_instance,
mock.sentinel.instance)
mock.sentinel.instance, None)
self._inspector._utils.get_cpu_metrics.side_effect = (
os_win_exc.HyperVException)
self.assertRaises(virt_inspector.InspectorException,
self._inspector.inspect_instance,
mock.sentinel.instance)
mock.sentinel.instance, None)
self._inspector._utils.get_cpu_metrics.side_effect = (
os_win_exc.NotFound(resource='foofoo'))
self.assertRaises(virt_inspector.InstanceNotFoundException,
self._inspector.inspect_instance,
mock.sentinel.instance)
mock.sentinel.instance, None)
def test_assert_original_traceback_maintained(self):
def bar(self):
@@ -65,7 +65,7 @@ class TestHyperVInspection(base.BaseTestCase):
self._inspector._utils.get_cpu_metrics.side_effect = bar
try:
self._inspector.inspect_instance(mock.sentinel.instance)
self._inspector.inspect_instance(mock.sentinel.instance, None)
self.fail("Test expected exception, but it was not raised.")
except virt_inspector.InstanceNotFoundException:
# exception has been raised as expected.
@@ -101,7 +101,7 @@ class TestHyperVInspection(base.BaseTestCase):
fake_cpu_clock_used, fake_cpu_count, fake_uptime)
fake_usage = self._inspector._utils.get_memory_metrics.return_value
stats = self._inspector.inspect_instance(fake_instance_name)
stats = self._inspector.inspect_instance(fake_instance_name, None)
self.assertEqual(fake_cpu_count, stats.cpu_number)
self.assertEqual(fake_cpu_time, stats.cpu_time)
@@ -121,7 +121,7 @@ class TestHyperVInspection(base.BaseTestCase):
'address': fake_address}]
inspected_vnics = list(self._inspector.inspect_vnics(
fake_instance_name))
fake_instance_name, None))
self.assertEqual(1, len(inspected_vnics))
@@ -145,7 +145,7 @@ class TestHyperVInspection(base.BaseTestCase):
'host_resource': fake_host_resource}]
inspected_disks = list(self._inspector.inspect_disks(
fake_instance_name))
fake_instance_name, None))
self.assertEqual(1, len(inspected_disks))
@@ -164,7 +164,7 @@ class TestHyperVInspection(base.BaseTestCase):
'instance_id': fake_instance_id}]
inspected_disks = list(self._inspector.inspect_disk_latency(
fake_instance_name))
fake_instance_name, None))
self.assertEqual(1, len(inspected_disks))
@@ -182,7 +182,7 @@ class TestHyperVInspection(base.BaseTestCase):
'instance_id': fake_instance_id}]
inspected_disks = list(self._inspector.inspect_disk_iops(
fake_instance_name))
fake_instance_name, None))
self.assertEqual(1, len(inspected_disks))

28
ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py
View File

@@ -71,7 +71,7 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
stats = self.inspector.inspect_instance(self.instance)
stats = self.inspector.inspect_instance(self.instance, None)
self.assertEqual(2, stats.cpu_number)
self.assertEqual(999999, stats.cpu_time)
self.assertEqual(90112, stats.cpu_l3_cache_usage)
@@ -94,7 +94,7 @@ class TestLibvirtInspection(base.BaseTestCase):
'refresh_libvirt_connection', return_value=conn):
self.assertRaises(virt_inspector.InstanceShutOffException,
self.inspector.inspect_instance,
self.instance)
self.instance, None)
def test_inspect_vnics(self):
dom_xml = """
@@ -170,7 +170,8 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
interfaces = list(self.inspector.inspect_vnics(self.instance))
interfaces = list(self.inspector.inspect_vnics(
self.instance, None))
self.assertEqual(3, len(interfaces))
vnic0 = interfaces[0]
@@ -219,7 +220,7 @@ class TestLibvirtInspection(base.BaseTestCase):
'refresh_libvirt_connection', return_value=conn):
inspect = self.inspector.inspect_vnics
self.assertRaises(virt_inspector.InstanceShutOffException,
list, inspect(self.instance))
list, inspect(self.instance, None))
def test_inspect_disks(self):
dom_xml = """
@@ -245,7 +246,7 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
disks = list(self.inspector.inspect_disks(self.instance))
disks = list(self.inspector.inspect_disks(self.instance, None))
self.assertEqual(1, len(disks))
self.assertEqual('vda', disks[0].device)
@@ -264,7 +265,7 @@ class TestLibvirtInspection(base.BaseTestCase):
'refresh_libvirt_connection', return_value=conn):
inspect = self.inspector.inspect_disks
self.assertRaises(virt_inspector.InstanceShutOffException,
list, inspect(self.instance))
list, inspect(self.instance, None))
def test_inspect_disk_info(self):
dom_xml = """
@@ -290,7 +291,8 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
disks = list(self.inspector.inspect_disk_info(self.instance))
disks = list(self.inspector.inspect_disk_info(
self.instance, None))
self.assertEqual(1, len(disks))
self.assertEqual('vda', disks[0].device)
@@ -322,7 +324,7 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
disks = list(self.inspector.inspect_disk_info(self.instance))
disks = list(self.inspector.inspect_disk_info(self.instance, None))
self.assertEqual(0, len(disks))
def test_inspect_disk_info_without_source_element(self):
@@ -350,7 +352,7 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
disks = list(self.inspector.inspect_disk_info(self.instance))
disks = list(self.inspector.inspect_disk_info(self.instance, None))
self.assertEqual(0, len(disks))
def test_inspect_memory_usage_with_domain_shutoff(self):
@@ -363,7 +365,7 @@ class TestLibvirtInspection(base.BaseTestCase):
'refresh_libvirt_connection', return_value=conn):
self.assertRaises(virt_inspector.InstanceShutOffException,
self.inspector.inspect_instance,
self.instance)
self.instance, None)
def test_inspect_memory_with_empty_stats(self):
domain = mock.Mock()
@@ -375,7 +377,7 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
stats = self.inspector.inspect_instance(self.instance)
stats = self.inspector.inspect_instance(self.instance, None)
self.assertIsNone(stats.memory_usage)
self.assertIsNone(stats.memory_resident)
@@ -391,7 +393,7 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
stats = self.inspector.inspect_instance(self.instance)
stats = self.inspector.inspect_instance(self.instance, None)
self.assertIsNone(stats.cpu_l3_cache_usage)
self.assertIsNone(stats.memory_bandwidth_total)
self.assertIsNone(stats.memory_bandwidth_local)
@@ -417,4 +419,4 @@ class TestLibvirtInspectionWithError(base.BaseTestCase):
def test_inspect_unknown_error(self):
self.assertRaises(virt_inspector.InspectorException,
self.inspector.inspect_instance, 'foo')
self.inspector.inspect_instance, 'foo', None)

9
ceilometer/tests/unit/compute/virt/vmware/test_inspector.py
View File

@@ -84,7 +84,7 @@ class TestVsphereInspection(base.BaseTestCase):
ops_mock = self._inspector._ops
ops_mock.get_perf_counter_id.return_value = fake_perf_counter_id
ops_mock.query_vm_aggregate_stats.return_value = fake_memory_value
stats = self._inspector.inspect_instance(mock.MagicMock())
stats = self._inspector.inspect_instance(mock.MagicMock(), None)
self.assertEqual(1.0, stats.memory_usage)
def test_inspect_cpu_util(self):
@@ -101,7 +101,7 @@ class TestVsphereInspection(base.BaseTestCase):
ops_mock.get_perf_counter_id.return_value = fake_perf_counter_id
(ops_mock.query_vm_aggregate_stats.
return_value) = fake_cpu_util_value * 100
stats = self._inspector.inspect_instance(mock.MagicMock())
stats = self._inspector.inspect_instance(mock.MagicMock(), None)
self.assertEqual(60, stats.cpu_util)
def test_inspect_vnic_rates(self):
@@ -137,7 +137,8 @@ class TestVsphereInspection(base.BaseTestCase):
ops_mock = self._inspector._ops
ops_mock.get_perf_counter_id.side_effect = get_counter_id_side_effect
ops_mock.query_vm_device_stats.side_effect = query_stat_side_effect
result = list(self._inspector.inspect_vnic_rates(mock.MagicMock()))
result = list(self._inspector.inspect_vnic_rates(
mock.MagicMock(), None))
self.assertEqual(1024.0, result[0].rx_bytes_rate)
self.assertEqual(2048.0, result[0].tx_bytes_rate)
@@ -181,7 +182,7 @@ class TestVsphereInspection(base.BaseTestCase):
ops_mock.get_perf_counter_id.side_effect = get_counter_id_side_effect
ops_mock.query_vm_device_stats.side_effect = query_stat_side_effect
result = self._inspector.inspect_disk_rates(mock.MagicMock())
result = self._inspector.inspect_disk_rates(mock.MagicMock(), None)
# validate result
expected_stats = {

12
ceilometer/tests/unit/compute/virt/xenapi/test_inspector.py
View File

@@ -84,7 +84,7 @@ class TestXenapiInspection(base.BaseTestCase):
session = self.inspector.session
with mock.patch.object(session, 'xenapi_request',
side_effect=fake_xenapi_request):
stats = self.inspector.inspect_instance(fake_instance)
stats = self.inspector.inspect_instance(fake_instance, None)
self.assertEqual(40, stats.cpu_util)
self.assertEqual(64, stats.memory_usage)
@@ -120,7 +120,7 @@ class TestXenapiInspection(base.BaseTestCase):
session = self.inspector.session
with mock.patch.object(session, 'xenapi_request',
side_effect=_fake_xenapi_request):
stats = self.inspector.inspect_instance(fake_instance)
stats = self.inspector.inspect_instance(fake_instance, None)
self.assertEqual(128, stats.memory_usage)
def test_inspect_vnics(self):
@@ -148,7 +148,7 @@ class TestXenapiInspection(base.BaseTestCase):
side_effect=bandwidth_returns):
interfaces = list(
self.inspector.inspect_vnics(fake_instance))
self.inspector.inspect_vnics(fake_instance, None))
self.assertEqual(1, len(interfaces))
vnic0 = interfaces[0]
@@ -172,7 +172,8 @@ class TestXenapiInspection(base.BaseTestCase):
session = self.inspector.session
with mock.patch.object(session, 'xenapi_request',
side_effect=side_effects):
interfaces = list(self.inspector.inspect_vnic_rates(fake_instance))
interfaces = list(self.inspector.inspect_vnic_rates(
fake_instance, None))
self.assertEqual(1, len(interfaces))
vnic0 = interfaces[0]
@@ -193,7 +194,8 @@ class TestXenapiInspection(base.BaseTestCase):
session = self.inspector.session
with mock.patch.object(session, 'xenapi_request',
side_effect=side_effects):
disks = list(self.inspector.inspect_disk_rates(fake_instance))
disks = list(self.inspector.inspect_disk_rates(
fake_instance, None))
self.assertEqual(1, len(disks))
disk0 = disks[0]