openstack
/
nova
Code Issues Proposed changes

Fix non-parameterized service id in hypervisors sample tests 

The hypervisors sample tests hard code the service id in the templates,
which can vary (and will in a subsequent patch). This makes it parameterized
so that it doesn't obsess over the actual value.

Change-Id: I28ae3eb14aa1630deaf6f943c9ad78dc3c36c7b3
(cherry picked from commit cf1d3f8792)
This commit is contained in:
Dan Smith 2016-12-13 15:22:49 -08:00 committed by Tony Breeds
parent 6ce8bcab7c
commit d7ac5d9235
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-detail-resp.json.tpl
View File

@ -20,7 +20,7 @@
"running_vms": 0,
"service": {
"host": "%(host_name)s",
"id": 2,
"id": "%(int:service_id)s",
"disabled_reason": null
},
"vcpus": 1,

2
nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/hypervisors-show-resp.json.tpl
View File

@ -19,7 +19,7 @@
"running_vms": 0,
"service": {
"host": "%(host_name)s",
"id": 2,
"id": "%(int:service_id)s",
"disabled_reason": null
},
"vcpus": 1,

2
nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.28/hypervisors-detail-resp.json.tpl
View File

@ -33,7 +33,7 @@
"running_vms": 0,
"service": {
"host": "%(host_name)s",
"id": 2,
"id": "%(int:service_id)s",
"disabled_reason": null
},
"vcpus": 1,

2
nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.28/hypervisors-show-resp.json.tpl
View File

@ -32,7 +32,7 @@
"running_vms": 0,
"service": {
"host": "%(host_name)s",
"id": 2,
"id": "%(int:service_id)s",
"disabled_reason": null
},
"vcpus": 1,

6
nova/tests/functional/api_sample_tests/test_hypervisors.py
View File

@ -59,7 +59,8 @@ class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21):
def test_hypervisors_detail(self):
hypervisor_id = '1'
subs = {
'hypervisor_id': hypervisor_id
'hypervisor_id': hypervisor_id,
'service_id': '[0-9]+',
}
response = self._do_get('os-hypervisors/detail')
self._verify_response('hypervisors-detail-resp', subs, response, 200)
@ -67,7 +68,8 @@ class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21):
def test_hypervisors_show(self):
hypervisor_id = '1'
subs = {
'hypervisor_id': hypervisor_id
'hypervisor_id': hypervisor_id,
'service_id': '[0-9]+',
}
response = self._do_get('os-hypervisors/%s' % hypervisor_id)
self._verify_response('hypervisors-show-resp', subs, response, 200)