diff --git a/ceilometer_zvm/compute/virt/zvm/inspector.py b/ceilometer_zvm/compute/virt/zvm/inspector.py index d4fc6df..09e6180 100644 --- a/ceilometer_zvm/compute/virt/zvm/inspector.py +++ b/ceilometer_zvm/compute/virt/zvm/inspector.py @@ -69,12 +69,14 @@ class ZVMInspector(virt_inspector.Inspector): parameters=None, rx_bytes=nic['nic_rx'], rx_packets=nic['nic_fr_rx'], - rx_bytes_delta=nic['nic_rx_delta'], + # rx_bytes_delta was taken out from zcc + rx_bytes_delta=None, rx_errors=nic['nic_fr_rx_err'], rx_drop=None, tx_bytes=nic['nic_tx'], tx_packets=nic['nic_fr_tx'], - tx_bytes_delta=nic['nic_tx_delta'], + # tx_bytes_delta was taken out from zcc + tx_bytes_delta=None, tx_errors=nic['nic_fr_tx_err'], tx_drop=None ) 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 f2cd719..4f23d8b 100644 --- a/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py +++ b/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py @@ -47,9 +47,11 @@ class TestZVMInspector(unittest.TestCase): 'nic_fr_rx': 99999, 'nic_fr_tx': 99999, 'nic_rx': 9999999, - 'nic_rx_delta': 9999999, + # attribute was taken out from zcc + # 'nic_rx_delta': 9999999, 'nic_tx': 9999999, - 'nic_tx_delta': 9999999, + # attribute was taken out from zcc + # 'nic_tx_delta': 9999999, 'nic_fr_rx_dsc': 0, 'nic_fr_tx_dsc': 0, 'nic_fr_rx_err': 0, @@ -59,9 +61,11 @@ class TestZVMInspector(unittest.TestCase): 'nic_fr_rx': 88888, 'nic_fr_tx': 88888, 'nic_rx': 8888888, - 'nic_rx_delta': 8888888, + # attribute was taken out from zcc + # 'nic_rx_delta': 8888888, 'nic_tx': 8888888, - 'nic_tx_delta': 8888888, + # attribute was taken out from zcc + # 'nic_tx_delta': 8888888, 'nic_fr_rx_dsc': 0, 'nic_fr_tx_dsc': 0, 'nic_fr_rx_err': 0,