b6dd96c342
This is the fifth and final patch moving config options from the nova/api directory. In this patch, the deprecated options from the legacy_v2 directory have been moved to nova/conf/legacy_v2.py. A subsequent patch will enhance the help text for these options. Blueprint centralize-config-options-newton Change-Id: I3fdff0d3c0c2f36155ad4f7060395e788b78d150
61 lines
2.3 KiB
Python
61 lines
2.3 KiB
Python
# Copyright 2012 Nebula, Inc.
|
|
# Copyright 2013 IBM Corp.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import nova.conf
|
|
from nova.tests.functional.api_sample_tests import test_servers
|
|
|
|
CONF = nova.conf.CONF
|
|
|
|
|
|
class ServerUsageSampleJsonTest(test_servers.ServersSampleBase):
|
|
extension_name = 'os-server-usage'
|
|
|
|
def _get_flags(self):
|
|
f = super(ServerUsageSampleJsonTest, self)._get_flags()
|
|
f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
|
|
f['osapi_compute_extension'].append(
|
|
'nova.api.openstack.compute.contrib.server_usage.Server_usage')
|
|
f['osapi_compute_extension'].append(
|
|
'nova.api.openstack.compute.contrib.keypairs.Keypairs')
|
|
f['osapi_compute_extension'].append(
|
|
'nova.api.openstack.compute.contrib.extended_ips.Extended_ips')
|
|
f['osapi_compute_extension'].append(
|
|
'nova.api.openstack.compute.contrib.extended_ips_mac.'
|
|
'Extended_ips_mac')
|
|
return f
|
|
|
|
def setUp(self):
|
|
"""setUp method for server usage."""
|
|
super(ServerUsageSampleJsonTest, self).setUp()
|
|
self.uuid = self._post_server()
|
|
|
|
def test_show(self):
|
|
response = self._do_get('servers/%s' % self.uuid)
|
|
subs = {}
|
|
subs['id'] = self.uuid
|
|
subs['hostid'] = '[a-f0-9]+'
|
|
subs['access_ip_v4'] = '1.2.3.4'
|
|
subs['access_ip_v6'] = '80fe::'
|
|
self._verify_response('server-get-resp', subs, response, 200)
|
|
|
|
def test_details(self):
|
|
response = self._do_get('servers/detail')
|
|
subs = {}
|
|
subs['id'] = self.uuid
|
|
subs['hostid'] = '[a-f0-9]+'
|
|
subs['access_ip_v4'] = '1.2.3.4'
|
|
subs['access_ip_v6'] = '80fe::'
|
|
self._verify_response('servers-detail-resp', subs, response, 200)
|