ba0339f413
There was an exceptionally large amount of rote use of _get_regexes throughout the samples tests, which doesn't provide any additional explicitness in what's happening, and only couples the tests to the base class in less useful ways. Instead, when we call _verify_response, always also use the base vanilla regexes for matching tests. We also needed to add a few more variables to the list which always need to be reset before testing against the static samples, because uuids are often generated on the fly for the tests. Lastly, test_keypairs needed some test specific surgery. It is so highly normalized (with private test methods that take **kwargs) at this point that it's not really clear that it's testing useful things any more. This really needs denormalization. Change-Id: I165b0f3aa2132373cb59982a5a5ded37b4fa1b52
88 lines
3.4 KiB
Python
88 lines
3.4 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.api_sample_tests import api_sample_base
|
|
|
|
CONF = cfg.CONF
|
|
CONF.import_opt('osapi_compute_extension',
|
|
'nova.api.openstack.compute.legacy_v2.extensions')
|
|
|
|
|
|
class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
|
|
ADMIN_API = True
|
|
extension_name = "os-aggregates"
|
|
|
|
def _get_flags(self):
|
|
f = super(AggregatesSampleJsonTest, self)._get_flags()
|
|
f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
|
|
f['osapi_compute_extension'].append(
|
|
'nova.api.openstack.compute.contrib.aggregates.Aggregates')
|
|
return f
|
|
|
|
def test_aggregate_create(self):
|
|
subs = {
|
|
"aggregate_id": '(?P<id>\d+)'
|
|
}
|
|
response = self._do_post('os-aggregates', 'aggregate-post-req', subs)
|
|
return self._verify_response('aggregate-post-resp',
|
|
subs, response, 200)
|
|
|
|
def test_list_aggregates(self):
|
|
self.test_aggregate_create()
|
|
response = self._do_get('os-aggregates')
|
|
self._verify_response('aggregates-list-get-resp', {}, response, 200)
|
|
|
|
def test_aggregate_get(self):
|
|
agg_id = self.test_aggregate_create()
|
|
response = self._do_get('os-aggregates/%s' % agg_id)
|
|
self._verify_response('aggregates-get-resp', {}, response, 200)
|
|
|
|
def test_add_metadata(self):
|
|
agg_id = self.test_aggregate_create()
|
|
response = self._do_post('os-aggregates/%s/action' % agg_id,
|
|
'aggregate-metadata-post-req',
|
|
{'action': 'set_metadata'})
|
|
self._verify_response('aggregates-metadata-post-resp', {},
|
|
response, 200)
|
|
|
|
def test_add_host(self):
|
|
aggregate_id = self.test_aggregate_create()
|
|
subs = {
|
|
"host_name": self.compute.host,
|
|
}
|
|
response = self._do_post('os-aggregates/%s/action' % aggregate_id,
|
|
'aggregate-add-host-post-req', subs)
|
|
self._verify_response('aggregates-add-host-post-resp', subs,
|
|
response, 200)
|
|
|
|
def test_remove_host(self):
|
|
self.test_add_host()
|
|
subs = {
|
|
"host_name": self.compute.host,
|
|
}
|
|
response = self._do_post('os-aggregates/1/action',
|
|
'aggregate-remove-host-post-req', subs)
|
|
self._verify_response('aggregates-remove-host-post-resp',
|
|
subs, response, 200)
|
|
|
|
def test_update_aggregate(self):
|
|
aggregate_id = self.test_aggregate_create()
|
|
response = self._do_put('os-aggregates/%s' % aggregate_id,
|
|
'aggregate-update-post-req', {})
|
|
self._verify_response('aggregate-update-post-resp',
|
|
{}, response, 200)
|