c651572d5a
The 'obj_make_compatible' method of MonitorMetric object doesn't work properly because conditional expression is not correct. So fix it and add a unit test for it. Change-Id: I9e5e8b975195b8120e6c10398c284d6a2f5efab9 Closes-Bug: #1617859
109 lines
4.3 KiB
Python
109 lines
4.3 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from oslo_serialization import jsonutils
|
|
from oslo_utils import timeutils
|
|
|
|
from nova import objects
|
|
from nova.objects import fields
|
|
from nova.tests.unit.objects import test_objects
|
|
|
|
_ts_now = timeutils.utcnow()
|
|
|
|
_monitor_metric_spec = {
|
|
'name': fields.MonitorMetricType.CPU_FREQUENCY,
|
|
'value': 1000,
|
|
'timestamp': _ts_now.isoformat(),
|
|
'source': 'nova.virt.libvirt.driver'
|
|
}
|
|
|
|
_monitor_metric_perc_spec = {
|
|
'name': fields.MonitorMetricType.CPU_PERCENT,
|
|
'value': 0.17,
|
|
'timestamp': _ts_now.isoformat(),
|
|
'source': 'nova.virt.libvirt.driver'
|
|
}
|
|
|
|
_monitor_numa_metric_spec = {
|
|
'name': fields.MonitorMetricType.NUMA_MEM_BW_CURRENT,
|
|
'numa_membw_values': {"0": 10, "1": 43},
|
|
'timestamp': _ts_now.isoformat(),
|
|
'source': 'nova.virt.libvirt.driver'
|
|
}
|
|
|
|
_monitor_metric_list_spec = [_monitor_metric_spec]
|
|
|
|
|
|
class _TestMonitorMetricObject(object):
|
|
def test_monitor_metric_to_dict(self):
|
|
obj = objects.MonitorMetric(name='cpu.frequency',
|
|
value=1000,
|
|
timestamp=_ts_now,
|
|
source='nova.virt.libvirt.driver')
|
|
self.assertEqual(_monitor_metric_spec, obj.to_dict())
|
|
|
|
def test_monitor_metric_perc_to_dict(self):
|
|
"""Test to ensure division by 100.0 occurs on percentage value."""
|
|
obj = objects.MonitorMetric(name='cpu.percent',
|
|
value=17,
|
|
timestamp=_ts_now,
|
|
source='nova.virt.libvirt.driver')
|
|
self.assertEqual(_monitor_metric_perc_spec, obj.to_dict())
|
|
|
|
def test_monitor_metric_list_to_list(self):
|
|
obj = objects.MonitorMetric(name='cpu.frequency',
|
|
value=1000,
|
|
timestamp=_ts_now,
|
|
source='nova.virt.libvirt.driver')
|
|
list_obj = objects.MonitorMetricList(objects=[obj])
|
|
self.assertEqual(_monitor_metric_list_spec, list_obj.to_list())
|
|
|
|
def test_monitor_NUMA_metric_to_dict(self):
|
|
obj = objects.MonitorMetric(name='numa.membw.current',
|
|
numa_membw_values={"0": 10, "1": 43},
|
|
timestamp=_ts_now,
|
|
source='nova.virt.libvirt.driver')
|
|
self.assertEqual(_monitor_numa_metric_spec, obj.to_dict())
|
|
|
|
def test_conversion_in_monitor_metric_list_from_json(self):
|
|
spec_list = [_monitor_metric_spec, _monitor_metric_perc_spec]
|
|
metrics = objects.MonitorMetricList.from_json(
|
|
jsonutils.dumps(spec_list))
|
|
for metric, spec in zip(metrics, spec_list):
|
|
exp = spec['value']
|
|
if (spec['name'] in
|
|
objects.monitor_metric.FIELDS_REQUIRING_CONVERSION):
|
|
exp = spec['value'] * 100
|
|
self.assertEqual(exp, metric.value)
|
|
|
|
def test_obj_make_compatible(self):
|
|
monitormetric_obj = objects.MonitorMetric(
|
|
name=fields.MonitorMetricType.NUMA_MEM_BW_CURRENT,
|
|
numa_membw_values={"0": 10, "1": 43},
|
|
timestamp=_ts_now.isoformat(),
|
|
source='nova.virt.libvirt.driver')
|
|
primitive = monitormetric_obj.obj_to_primitive()
|
|
self.assertIn('numa_membw_values', primitive['nova_object.data'])
|
|
monitormetric_obj.obj_make_compatible(primitive['nova_object.data'],
|
|
'1.0')
|
|
self.assertNotIn('numa_membw_values', primitive['nova_object.data'])
|
|
|
|
|
|
class TestMonitorMetricObject(test_objects._LocalTest,
|
|
_TestMonitorMetricObject):
|
|
pass
|
|
|
|
|
|
class TestRemoteMonitorMetricObject(test_objects._RemoteTest,
|
|
_TestMonitorMetricObject):
|
|
pass
|