a7ca5069fc
The first step in the code cleanup for removing the API V3 references is to move the existing default V2 code into a directory named 'legacy_v2'. This moves the files, and updates all references to them. This is the first in a patch series of discreet changes to the codebase structure. Partial-Bug: #1462901 Change-Id: Ic19f2d019c2c78f1de14a0eced85e84f2d2cec28
65 lines
2.6 KiB
Python
65 lines
2.6 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.
|
|
|
|
from oslo_config import cfg
|
|
|
|
from nova.tests.functional.v3 import test_servers
|
|
|
|
CONF = cfg.CONF
|
|
CONF.import_opt('osapi_compute_extension',
|
|
'nova.api.openstack.compute.legacy_v2.extensions')
|
|
|
|
|
|
class ExtendedAvailabilityZoneJsonTests(test_servers.ServersSampleBase):
|
|
extension_name = "os-extended-availability-zone"
|
|
extra_extensions_to_load = ["os-access-ips"]
|
|
# TODO(gmann): Overriding '_api_version' till all functional tests
|
|
# are merged between v2 and v2.1. After that base class variable
|
|
# itself can be changed to 'v2'
|
|
_api_version = 'v2'
|
|
|
|
def _get_flags(self):
|
|
f = super(ExtendedAvailabilityZoneJsonTests, self)._get_flags()
|
|
f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
|
|
f['osapi_compute_extension'].append(
|
|
'nova.api.openstack.compute.contrib.keypairs.Keypairs')
|
|
f['osapi_compute_extension'].append(
|
|
'nova.api.openstack.compute.contrib.extended_availability_zone.'
|
|
'Extended_availability_zone')
|
|
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 test_show(self):
|
|
uuid = self._post_server()
|
|
response = self._do_get('servers/%s' % uuid)
|
|
subs = self._get_regexes()
|
|
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_detail(self):
|
|
self._post_server()
|
|
response = self._do_get('servers/detail')
|
|
subs = self._get_regexes()
|
|
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)
|