diff options
| author | Akira Yoshiyama <a-yoshiyama@bu.jp.nec.com> | 2013-04-14 11:39:55 +0000 |
|---|---|---|
| committer | Akira Yoshiyama <a-yoshiyama@bu.jp.nec.com> | 2013-05-19 00:31:53 +0000 |
| commit | 616e5d965bd8a2923f00ba4ff194e6a6ee2468cd (patch) | |
| tree | e9026cfd86deafc709adaf69dff4cb2d9dd03a6a /nova/tests | |
| parent | e4f05bada6bba3dfab936bb0e77a673b640b6f9e (diff) | |
| download | nova-616e5d965bd8a2923f00ba4ff194e6a6ee2468cd.tar.gz nova-616e5d965bd8a2923f00ba4ff194e6a6ee2468cd.tar.xz nova-616e5d965bd8a2923f00ba4ff194e6a6ee2468cd.zip | |
Make nova-api use servicegroup.API.service_is_up().
Fix bug 1168861
Change-Id: I1e7e8f7519ec627b96736f74ee7123d101973544
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_services.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_services.py b/nova/tests/api/openstack/compute/contrib/test_services.py index 57dd056ee..387a5eb21 100644 --- a/nova/tests/api/openstack/compute/contrib/test_services.py +++ b/nova/tests/api/openstack/compute/contrib/test_services.py @@ -21,6 +21,7 @@ from nova import context from nova import db from nova import exception from nova.openstack.common import timeutils +from nova.servicegroup.drivers import db as db_driver from nova import test from nova.tests.api.openstack import fakes @@ -202,3 +203,13 @@ class ServicesTest(test.TestCase): res_dict = self.controller.update(req, "disable", body) self.assertEqual(res_dict['service']['status'], 'disabled') + + # This test is just to verify that the servicegroup API gets used when + # calling this API. + def test_services_with_exception(self): + def dummy_is_up(self, dummy): + raise KeyError() + + self.stubs.Set(db_driver.DbDriver, 'is_up', dummy_is_up) + req = FakeRequestWithHostService() + self.assertRaises(KeyError, self.controller.index, req) |