From 02c4ba9fded5491db25848a61f69049e2c02be79 Mon Sep 17 00:00:00 2001
From: Huang Rui <bjhuangr@cn.ibm.com>
Date: Thu, 17 Sep 2015 10:45:28 +0800
Subject: [PATCH] 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
---
 ceilometer_zvm/compute/virt/zvm/inspector.py  | 25 +++++++
 .../unit/compute/virt/zvm/test_inspector.py   | 70 +++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/ceilometer_zvm/compute/virt/zvm/inspector.py b/ceilometer_zvm/compute/virt/zvm/inspector.py
index ca43450..a519a5a 100644
--- a/ceilometer_zvm/compute/virt/zvm/inspector.py
+++ b/ceilometer_zvm/compute/virt/zvm/inspector.py
@@ -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()
diff --git a/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py b/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py
index 9e0fe76..b5f0403 100644
--- a/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py
+++ b/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py
@@ -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')