diff --git a/ceilometer_zvm/compute/virt/zvm/inspector.py b/ceilometer_zvm/compute/virt/zvm/inspector.py index 6313e00..3303ddd 100644 --- a/ceilometer_zvm/compute/virt/zvm/inspector.py +++ b/ceilometer_zvm/compute/virt/zvm/inspector.py @@ -179,10 +179,8 @@ class ZVMInspector(virt_inspector.Inspector): def inspect_vnics(self, instance): inst_stat = self._get_inst_stat('vnics', instance) for nic in inst_stat['nics']: - nic_id = '_'.join((nic['vswitch_name'], inst_stat['userid'], - nic['nic_vdev'])) interface = virt_inspector.Interface( - name=nic_id, + name=nic['nic_vdev'], mac=None, fref=None, parameters=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 f94334b..29d7d29 100644 --- a/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py +++ b/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py @@ -310,7 +310,7 @@ class TestZVMInspector(base.BaseTestCase): 'nic_fr_rx_err': 0, 'nic_fr_tx_err': 0}]} nic, stat = list(self.inspector.inspect_vnics({'inst1': 'INST1'}))[0] - if nic.name == 'vsw1_INST1_0600': + if nic.name == '0600': self.assertEqual(99999, stat.rx_packets) else: self.assertEqual(8888888, stat.rx_bytes)