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/api | |
| 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/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/services.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py index 9952484f7..bc5f60b64 100644 --- a/nova/api/openstack/compute/contrib/services.py +++ b/nova/api/openstack/compute/contrib/services.py @@ -22,8 +22,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute from nova import exception -from nova.openstack.common import timeutils -from nova import utils +from nova import servicegroup authorize = extensions.extension_authorizer('compute', 'services') CONF = cfg.CONF @@ -71,6 +70,7 @@ class ServiceController(object): def __init__(self): self.host_api = compute.HostAPI() + self.servicegroup_api = servicegroup.API() @wsgi.serializers(xml=ServicesIndexTemplate) def index(self, req): @@ -79,7 +79,6 @@ class ServiceController(object): """ context = req.environ['nova.context'] authorize(context) - now = timeutils.utcnow() services = self.host_api.service_get_all( context, set_zones=True) @@ -96,8 +95,7 @@ class ServiceController(object): svcs = [] for svc in services: - delta = now - (svc['updated_at'] or svc['created_at']) - alive = abs(utils.total_seconds(delta)) <= CONF.service_down_time + alive = self.servicegroup_api.service_is_up(svc) art = (alive and "up") or "down" active = 'enabled' if svc['disabled']: |