openstack/nova
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2015-12-15 20:52:55 +00:00
committed by Gerrit Code Review
parent 67f124b81a 7974f83743
commit ada4eca47d
6 changed files with 2 additions and 26 deletions
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": [ "availabilityZoneInfo": [
{ {
"hosts": { "hosts": {
"cells": {
"nova-cells": {
"active": true,
"available": true,
"updated_at": null
}
},
"cert": { "cert": {
"nova-cert": { "nova-cert": {
"active": true, "active": true,

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

@@ -29,11 +29,6 @@
"host_name": "abffda96592c4eacaf4111c28fddee17", "host_name": "abffda96592c4eacaf4111c28fddee17",
"service": "scheduler", "service": "scheduler",
"zone": "internal" "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 "updated_at": %(strtime_or_none)s
} }
}, },
"cells": {
"nova-cells": {
"active": true,
"available": true,
"updated_at": %(strtime_or_none)s
}
},
"scheduler": { "scheduler": {
"nova-scheduler": { "nova-scheduler": {
"active": true, "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", "host_name": "%(host_name)s",
"service": "scheduler", "service": "scheduler",
"zone": "internal" "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 # db_check_interval < 0 makes cells manager always hit the DB
self.flags(enable=True, db_check_interval=-1, group='cells') self.flags(enable=True, db_check_interval=-1, group='cells')
super(CellsSampleJsonTest, self).setUp() super(CellsSampleJsonTest, self).setUp()
self.cells = self.start_service('cells', manager=CONF.cells.manager)
self._stub_cells() self._stub_cells()
def _stub_cells(self, num_cells=5): 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.network = self.start_service('network')
self.scheduler = self._setup_scheduler_service() self.scheduler = self._setup_scheduler_service()
self.cells = self.start_service('cells', manager=CONF.cells.manager)
def _get_test_client(self): def _get_test_client(self):
return client.TestOpenStackClient('fake', 'fake', self.auth_url) return client.TestOpenStackClient('fake', 'fake', self.auth_url)