diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-28 17:48:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-28 17:48:31 +0000 |
| commit | 3e8e1e7178cfb78f1ded3bebc988d649bd982caf (patch) | |
| tree | f3844673a93d06189da37fb2ba4cb1b91668bacf /nova/tests | |
| parent | e0ef89f091a77a25fa9bcfd466159e101cb42c56 (diff) | |
| parent | 88196c3a4fa9cbf549594fe4d6128fcfab76ff66 (diff) | |
Merge "Use instance uuids for consoles and diagnostics."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_compute.py | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 6e1302520..a67d16e40 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -374,33 +374,42 @@ class ComputeTestCase(BaseTestCase): def test_console_output(self): """Make sure we can get console output from instance""" - instance_id = self._create_instance() - self.compute.run_instance(self.context, instance_id) + instance = self._create_fake_instance() + self.compute.run_instance(self.context, instance['id']) console = self.compute.get_console_output(self.context, - instance_id) + instance['uuid']) self.assert_(console) - self.compute.terminate_instance(self.context, instance_id) + self.compute.terminate_instance(self.context, instance['id']) def test_ajax_console(self): """Make sure we can get console output from instance""" - instance_id = self._create_instance() - self.compute.run_instance(self.context, instance_id) + instance = self._create_fake_instance() + self.compute.run_instance(self.context, instance['id']) console = self.compute.get_ajax_console(self.context, - instance_id) + instance['uuid']) self.assert_(set(['token', 'host', 'port']).issubset(console.keys())) - self.compute.terminate_instance(self.context, instance_id) + self.compute.terminate_instance(self.context, instance['id']) def test_vnc_console(self): """Make sure we can a vnc console for an instance.""" - instance_id = self._create_instance() - self.compute.run_instance(self.context, instance_id) + instance = self._create_fake_instance() + self.compute.run_instance(self.context, instance['id']) - console = self.compute.get_vnc_console(self.context, - instance_id) + console = self.compute.get_vnc_console(self.context, instance['uuid']) self.assert_(console) - self.compute.terminate_instance(self.context, instance_id) + self.compute.terminate_instance(self.context, instance['id']) + + def test_diagnostics(self): + """Make sure we can get diagnostics for an instance.""" + instance = self._create_fake_instance() + self.compute.run_instance(self.context, instance['id']) + + diagnostics = self.compute.get_diagnostics(self.context, + instance['uuid']) + self.assertEqual(diagnostics, 'FAKE_DIAGNOSTICS') + self.compute.terminate_instance(self.context, instance['id']) def test_add_fixed_ip_usage_notification(self): def dummy(*args, **kwargs): |