openstack/nova
Code Issues Proposed changes

Merge "Fix V2 hide server address functional tests"

Browse Source
This commit is contained in:
Jenkins 2015-03-20 02:19:40 +00:00 committed by Gerrit Code Review
commit 59356a4d80
5 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/api_samples/os-hide-server-addresses/server-get-resp.json
View File

@ -2,14 +2,7 @@
"server": {
"accessIPv4": "",
"accessIPv6": "",
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"version": 4
}
]
},
"addresses": {},
"created": "2012-12-19T20:32:40Z",
"flavor": {
"id": "1",

9
doc/api_samples/os-hide-server-addresses/servers-details-resp.json
View File

@ -3,14 +3,7 @@
{
"accessIPv4": "",
"accessIPv6": "",
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"version": 4
}
]
},
"addresses": {},
"created": "2012-12-19T20:32:37Z",
"flavor": {
"id": "1",

9
nova/tests/functional/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
View File

@ -2,14 +2,7 @@
"server": {
"accessIPv4": "",
"accessIPv6": "",
"addresses": {
"private": [
{
"addr": "%(ip)s",
"version": 4
}
]
},
"addresses": {},
"created": "%(isotime)s",
"flavor": {
"id": "1",

9
nova/tests/functional/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
View File

@ -3,14 +3,7 @@
{
"accessIPv4": "",
"accessIPv6": "",
"addresses": {
"private": [
{
"addr": "%(ip)s",
"version": 4
}
]
},
"addresses": {},
"created": "%(isotime)s",
"flavor": {
"id": "1",

9
nova/tests/functional/test_api_samples.py
View File

@ -40,6 +40,7 @@ from nova.compute import api as compute_api
from nova.compute import cells_api as cells_api
from nova.compute import manager as compute_manager
from nova.compute import rpcapi as compute_rpcapi
from nova.compute import vm_states
from nova.conductor import manager as conductor_manager
from nova.console import manager as console_manager # noqa - only for cfg
from nova import context
@ -237,6 +238,14 @@ class ServersSampleHideAddressesJsonTest(ServersSampleJsonTest):
'hide_server_addresses',
'Hide_server_addresses'))
def setUp(self):
# We override osapi_hide_server_address_states in order
# to have an example of in the json samples of the
# addresses being hidden
CONF.set_override("osapi_hide_server_address_states",
[vm_states.ACTIVE])
super(ServersSampleHideAddressesJsonTest, self).setUp()
class ServersSampleMultiStatusJsonTest(ServersSampleBase):
extension_name = '.'.join(('nova.api.openstack.compute.contrib',