afc3a16ce3
nova usage-list can return incorrect results, having resources counted twice. This only occurs when using the 2.40 microversion or later. This microversion introduced pagination, which doesn't work properly. Nova API will sort the instances using the tenant id and instance uuid, but 'os-simple-tenant-usage' will not preserve the order when returning the results. For this reason, subsequent API calls made by the client will use the wrong marker (which is supposed to be the last instance id), ending up counting the same instances twice. Change-Id: I6c7a67b23ec49aa207c33c38580acd834bb27e3c Closes-Bug: #1796689
127 lines
4.6 KiB
Python
127 lines
4.6 KiB
Python
# 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 os
|
|
|
|
import testscenarios
|
|
|
|
import nova.conf
|
|
from nova import test
|
|
from nova.tests import fixtures
|
|
from nova.tests.functional import api_paste_fixture
|
|
from nova.tests.functional import api_samples_test_base
|
|
from nova.tests.unit import fake_network
|
|
|
|
CONF = nova.conf.CONF
|
|
|
|
# API samples heavily uses testscenarios. This allows us to use the
|
|
# same tests, with slight variations in configuration to ensure our
|
|
# various ways of calling the API are compatible. Testscenarios works
|
|
# through the class level ``scenarios`` variable. It is an array of
|
|
# tuples where the first value in each tuple is an arbitrary name for
|
|
# the scenario (should be unique), and the second item is a dictionary
|
|
# of attributes to change in the class for the test.
|
|
#
|
|
# By default we're running scenarios for 2 situations
|
|
#
|
|
# - Hitting the default /v2 endpoint with the v2.1 Compatibility stack
|
|
#
|
|
# - Hitting the default /v2.1 endpoint
|
|
#
|
|
# Things we need to set:
|
|
#
|
|
# - api_major_version - what version of the API we should be hitting
|
|
#
|
|
# - microversion - what API microversion should be used
|
|
#
|
|
# - _additional_fixtures - any additional fixtures need
|
|
#
|
|
# NOTE(sdague): if you want to build a test that only tests specific
|
|
# microversions, then replace the ``scenarios`` class variable in that
|
|
# test class with something like:
|
|
#
|
|
# [("v2_11", {'api_major_version': 'v2.1', 'microversion': '2.11'})]
|
|
|
|
|
|
class ApiSampleTestBaseV21(testscenarios.WithScenarios,
|
|
api_samples_test_base.ApiSampleTestBase):
|
|
SUPPORTS_CELLS = False
|
|
|
|
api_major_version = 'v2'
|
|
# any additional fixtures needed for this scenario
|
|
_additional_fixtures = []
|
|
sample_dir = None
|
|
_use_project_id = True
|
|
|
|
scenarios = [
|
|
# test v2 with the v2.1 compatibility stack
|
|
('v2', {
|
|
'api_major_version': 'v2'}),
|
|
# test v2.1 base microversion
|
|
('v2_1', {
|
|
'api_major_version': 'v2.1'}),
|
|
# test v2.18 code without project id
|
|
('v2_1_noproject_id', {
|
|
'api_major_version': 'v2.1',
|
|
'_use_project_id': False,
|
|
'_additional_fixtures': [
|
|
api_paste_fixture.ApiPasteNoProjectId]})
|
|
]
|
|
|
|
def setUp(self):
|
|
self.flags(use_ipv6=False)
|
|
self.flags(glance_link_prefix=self._get_glance_host(),
|
|
compute_link_prefix=self._get_host(),
|
|
group='api')
|
|
|
|
# load any additional fixtures specified by the scenario
|
|
for fix in self._additional_fixtures:
|
|
self.useFixture(fix())
|
|
|
|
if not self.SUPPORTS_CELLS:
|
|
# NOTE(danms): Disable base automatic DB (and cells) config
|
|
self.USES_DB = False
|
|
self.USES_DB_SELF = True
|
|
# This is to enable the network quota which is being registered
|
|
# based on CONF.enable_network_quota. Need this to test the
|
|
# network quota in quota sample tests.
|
|
self.flags(enable_network_quota=True)
|
|
self.useFixture(fixtures.RegisterNetworkQuota())
|
|
|
|
# super class call is delayed here so that we have the right
|
|
# paste and conf before loading all the services, as we can't
|
|
# change these later.
|
|
super(ApiSampleTestBaseV21, self).setUp()
|
|
|
|
if not self.SUPPORTS_CELLS:
|
|
self.useFixture(fixtures.Database())
|
|
self.useFixture(fixtures.Database(database='api'))
|
|
# FIXME(cdent): Placement db already provided by IntegratedHelpers
|
|
self.useFixture(fixtures.Database(database='placement'))
|
|
self.useFixture(fixtures.DefaultFlavorsFixture())
|
|
self.useFixture(fixtures.SingleCellSimple())
|
|
|
|
super(ApiSampleTestBaseV21, self)._setup_services()
|
|
|
|
if not self.USE_NEUTRON:
|
|
# self.network is only setup if USE_NEUTRON=False
|
|
self.useFixture(test.SampleNetworks(host=self.network.host))
|
|
fake_network.stub_compute_with_ips(self)
|
|
self.useFixture(fixtures.SpawnIsSynchronousFixture())
|
|
# this is used to generate sample docs
|
|
self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None
|
|
|
|
def _setup_services(self):
|
|
pass
|