x
/
ceilometer-zvm
Code Issues Proposed changes

Add zvm inspector helper method to update cached nic data 

inspector method _update_inst_nic_stats is used to get nic data
from zvmutils.virtual_network_vswitch_query_iuo_stats, and deal
with the data then update the nic data into inspector cache.

Change-Id: I7ff6f273535442a5dd5f50db7b5f9f36dd5d3fd9
This commit is contained in:
Huang Rui 2015-09-17 10:45:28 +08:00
parent 732c635363
commit 02c4ba9fde
2 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ceilometer_zvm/compute/virt/zvm/inspector.py
View File

@ -95,6 +95,31 @@ class ZVMInspector(virt_inspector.Inspector):
self.cache.set(inst_stat)
def _update_inst_nic_stat(self, instances):
vsw_dict = zvmutils.virutal_network_vswitch_query_iuo_stats(
self.zhcp_info['nodename'])
with zvmutils.expect_invalid_xcat_resp_data():
for vsw in vsw_dict['vswitches']:
for nic in vsw['nics']:
for inst_name, userid in instances.items():
if nic['userid'].upper() == userid.upper():
nic_entry = {'vswitch_name': vsw['vswitch_name'],
'nic_vdev': nic['vdev'],
'nic_fr_rx': int(nic['nic_fr_rx']),
'nic_fr_tx': int(nic['nic_fr_tx']),
'nic_rx': int(nic['nic_rx']),
'nic_tx': int(nic['nic_tx'])}
inst_stat = self.cache.get(inst_name)
if inst_stat is None:
inst_stat = {
'nodename': inst_name,
'userid': userid,
'nics': [nic_entry]
}
else:
inst_stat['nics'].append(nic_entry)
self.cache.set(inst_stat)
def _update_cache(self, meter, instances={}):
if instances == {}:
self.cache.clear()

70
ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py
View File

@ -163,3 +163,73 @@ class TestZVMInspector(base.BaseTestCase):
mem_usage = self.inspector.inspect_memory_usage(None)
self.assertEqual(1998, mem_usage.usage)
get_stat.assert_called_once_with('memory.usage', None)
@mock.patch.object(zvmutils, 'virutal_network_vswitch_query_iuo_stats')
def test_update_inst_nic_stat(self, vswq):
vsw_dist = {'vswitches': [
{'vswitch_name': 'XCATVSW1',
'nics': [
{'nic_fr_rx_dsc': '0',
'nic_fr_rx_err': '0',
'nic_fr_tx_err': '4',
'userid': 'INST1',
'nic_rx': '103024058',
'nic_fr_rx': '573952',
'nic_fr_tx': '548780',
'vdev': '0600',
'nic_fr_tx_dsc': '0',
'nic_tx': '102030890'},
{'nic_fr_rx_dsc': '0',
'nic_fr_rx_err': '0',
'nic_fr_tx_err': '4',
'userid': 'INST2',
'nic_rx': '3111714',
'nic_fr_rx': '17493',
'nic_fr_tx': '16886',
'vdev': '0600',
'nic_fr_tx_dsc': '0',
'nic_tx': '3172646'}]},
{'vswitch_name': 'XCATVSW2',
'nics': [
{'nic_fr_rx_dsc': '0',
'nic_fr_rx_err': '0',
'nic_fr_tx_err': '0',
'userid': 'INST1',
'nic_rx': '4684435',
'nic_fr_rx': '34958',
'nic_fr_tx': '16211',
'vdev': '1000',
'nic_fr_tx_dsc': '0',
'nic_tx': '3316601'},
{'nic_fr_rx_dsc': '0',
'nic_fr_rx_err': '0',
'nic_fr_tx_err': '0',
'userid': 'INST2',
'nic_rx': '3577163',
'nic_fr_rx': '27211',
'nic_fr_tx': '12344',
'vdev': '1000',
'nic_fr_tx_dsc': '0',
'nic_tx': '2515045'}]}],
'vswitch_count': 2}
vswq.return_value = vsw_dist
instances = {'inst1': 'INST1', 'inst2': 'INST2'}
self.inspector._update_inst_nic_stat(instances)
exp_inst1_nics_data = [
{'nic_vdev': '0600',
'vswitch_name': 'XCATVSW1',
'nic_rx': 103024058,
'nic_fr_rx': 573952,
'nic_fr_tx': 548780,
'nic_tx': 102030890},
{'nic_vdev': '1000',
'vswitch_name': 'XCATVSW2',
'nic_rx': 4684435,
'nic_fr_rx': 34958,
'nic_fr_tx': 16211,
'nic_tx': 3316601}
]
self.assertEqual(exp_inst1_nics_data,
self.inspector.cache.get('inst1')['nics'])
vswq.assert_called_once_with('zhcp')