diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-22 22:38:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-22 22:38:35 +0000 |
| commit | f88ec2a52a400b81d75ffdf041b2991d8c57dd9e (patch) | |
| tree | ccd40324c84dc4d9638204a03774ca1ded749b42 | |
| parent | 16d653a3067332dc06f5138d2b842a79d65803a6 (diff) | |
| parent | ad2d4c379c5d424bde1832b664f36aa29432d64f (diff) | |
| download | nova-f88ec2a52a400b81d75ffdf041b2991d8c57dd9e.tar.gz nova-f88ec2a52a400b81d75ffdf041b2991d8c57dd9e.tar.xz nova-f88ec2a52a400b81d75ffdf041b2991d8c57dd9e.zip | |
Merge "Add meaningful server diagnostic information to fake hypervisor"
| -rw-r--r-- | nova/tests/compute/test_compute.py | 23 | ||||
| -rw-r--r-- | nova/virt/fake.py | 17 |
2 files changed, 34 insertions, 6 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index b4510303b..c98c9535e 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -1236,16 +1236,29 @@ class ComputeTestCase(BaseTestCase): def test_diagnostics(self): """Make sure we can get diagnostics for an instance.""" + expected_diagnostic = {'cpu0_time': 17300000000, + 'memory': 524288, + 'vda_errors': -1, + 'vda_read': 262144, + 'vda_read_req': 112, + 'vda_write': 5778432, + 'vda_write_req': 488, + 'vnet1_rx': 2070139, + 'vnet1_rx_drop': 0, + 'vnet1_rx_errors': 0, + 'vnet1_rx_packets': 26701, + 'vnet1_tx': 140208, + 'vnet1_tx_drop': 0, + 'vnet1_tx_errors': 0, + 'vnet1_tx_packets': 662, + } + instance = jsonutils.to_primitive(self._create_fake_instance()) self.compute.run_instance(self.context, instance=instance) diagnostics = self.compute.get_diagnostics(self.context, instance=instance) - self.assertEqual(diagnostics, 'FAKE_DIAGNOSTICS') - - diagnostics = self.compute.get_diagnostics(self.context, - instance=instance) - self.assertEqual(diagnostics, 'FAKE_DIAGNOSTICS') + self.assertEqual(diagnostics, expected_diagnostic) self.compute.terminate_instance(self.context, instance=instance) def test_add_fixed_ip_usage_notification(self): diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 6134019b2..0996988cd 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -184,7 +184,22 @@ class FakeDriver(driver.ComputeDriver): 'cpu_time': 0} def get_diagnostics(self, instance_name): - return 'FAKE_DIAGNOSTICS' + return {'cpu0_time': 17300000000, + 'memory': 524288, + 'vda_errors': -1, + 'vda_read': 262144, + 'vda_read_req': 112, + 'vda_write': 5778432, + 'vda_write_req': 488, + 'vnet1_rx': 2070139, + 'vnet1_rx_drop': 0, + 'vnet1_rx_errors': 0, + 'vnet1_rx_packets': 26701, + 'vnet1_tx': 140208, + 'vnet1_tx_drop': 0, + 'vnet1_tx_errors': 0, + 'vnet1_tx_packets': 662, + } def get_all_bw_counters(self, instances): """Return bandwidth usage counters for each interface on each |