openstack/nova
Code Issues Proposed changes

Remove cells service from api samples that don't test cells

Browse Source 
Instead of having cells service started for every api samples test,
whether or not it is used, only start it on test_cells. This saves
some setup / teardown time, and makes things a bit more explicit.

It also removes the cells service from service listing for a couple of
api samples (az and hosts). That's more indicative of what people will
see in real systems as cells is still a minority and experimental
deploy option.

Change-Id: Ie6d7e8978fd2b3441a141c69d4191266d76e7327
This commit is contained in:
Sean Dague 2015-12-10 13:03:48 -05:00
parent 415b221e33
commit 7974f83743
6 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/api_samples/os-availability-zone/availability-zone-detail-resp.json
View File

@ -2,13 +2,6 @@
"availabilityZoneInfo": [
{
"hosts": {
"cells": {
"nova-cells": {
"active": true,
"available": true,
"updated_at": null
}
},
"cert": {
"nova-cert": {
"active": true,

7
doc/api_samples/os-hosts/hosts-list-resp.json
View File

@ -29,11 +29,6 @@
"host_name": "abffda96592c4eacaf4111c28fddee17",
"service": "scheduler",
"zone": "internal"
},
{
"host_name": "a8820f04962a4b4ba9fe2e9540c24094",
"service": "cells",
"zone": "internal"
}
]
}
}

7
nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl
View File

@ -23,13 +23,6 @@
"updated_at": %(strtime_or_none)s
}
},
"cells": {
"nova-cells": {
"active": true,
"available": true,
"updated_at": %(strtime_or_none)s
}
},
"scheduler": {
"nova-scheduler": {
"active": true,

5
nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl
View File

@ -29,11 +29,6 @@
"host_name": "%(host_name)s",
"service": "scheduler",
"zone": "internal"
},
{
"host_name": "%(host_name)s",
"service": "cells",
"zone": "internal"
}
]
}

1
nova/tests/functional/api_sample_tests/test_cells.py
View File

@ -44,6 +44,7 @@ class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
# db_check_interval < 0 makes cells manager always hit the DB
self.flags(enable=True, db_check_interval=-1, group='cells')
super(CellsSampleJsonTest, self).setUp()
self.cells = self.start_service('cells', manager=CONF.cells.manager)
self._stub_cells()
def _stub_cells(self, num_cells=5):

1
nova/tests/functional/integrated_helpers.py
View File

@ -115,7 +115,6 @@ class _IntegratedTestBase(test.TestCase):
self.network = self.start_service('network')
self.scheduler = self._setup_scheduler_service()
self.cells = self.start_service('cells', manager=CONF.cells.manager)
def _get_test_client(self):
return client.TestOpenStackClient('fake', 'fake', self.auth_url)