Chris Dent
787bb33606
Adjust the fixtures used by the functional tests so they use placement database and web fixtures defined by placement code. To avoid making redundant changes, the solely placement- related unit and functional tests are removed, but the placement code itself is not (yet). openstack-placement is required by the functional tests. It is not added to test-requirements as we do not want unit tests to depend on placement in any way, and we enforce this by not having placement in the test env. The concept of tox-siblings is used to ensure that the placement requirement will be satisfied correctly if there is a depends-on. To make this happen, the functional jobs defined in .zuul.yaml are updated to require openstack/placement. tox.ini has to be updated to use a envdir that is the same name as job. Otherwise the tox siblings role in ansible cannot work. The handling of the placement fixtures is moved out of nova/test.py into the functional tests that actually use it because we do not want unit tests (which get the base test class out of test.py) to have anything to do with placement. This requires adjusting some test files to use absolute import. Similarly, a test of the comparison function for the api samples tests is moved into functional, because it depends on placement functionality, TestUpgradeCheckResourceProviders in unit.cmd.test_status is moved into a new test file: nova/tests/functional/test_nova_status.py. This is done because it requires the PlacementFixture, which is only available to functional tests. A MonkeyPatch is required in the test to make sure that the right context managers are used at the right time in the command itself (otherwise some tables do no exist). In the test itself, to avoid speaking directly to the placement database, which would require manipulating the RequestContext objects, resource providers are now created over the API. Co-Authored-By: Balazs Gibizer <balazs.gibizer@ericsson.com> Change-Id: Idaed39629095f86d24a54334c699a26c218c6593
94 lines
4.1 KiB
Python
94 lines
4.1 KiB
Python
# Copyright 2017 Huawei Technologies Co.,LTD.
|
|
#
|
|
# 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 nova import test
|
|
from nova.tests import fixtures as nova_fixtures
|
|
from nova.tests.functional import fixtures as func_fixtures
|
|
from nova.tests.functional import integrated_helpers
|
|
from nova.tests.unit.image import fake as image_fake
|
|
from nova.tests.unit import policy_fixture
|
|
|
|
|
|
class ServerTagsFilteringTest(test.TestCase,
|
|
integrated_helpers.InstanceHelperMixin):
|
|
"""Simple tests to create servers with tags and then list servers using
|
|
the various tag filters.
|
|
|
|
This is a regression test for bug 1682693 introduced in Newton when we
|
|
started pulling instances from cell0 and the main cell.
|
|
"""
|
|
|
|
def setUp(self):
|
|
super(ServerTagsFilteringTest, self).setUp()
|
|
self.useFixture(policy_fixture.RealPolicyFixture())
|
|
# The NeutronFixture is needed to stub out validate_networks in API.
|
|
self.useFixture(nova_fixtures.NeutronFixture(self))
|
|
# Use the PlacementFixture to avoid annoying warnings in the logs.
|
|
self.useFixture(func_fixtures.PlacementFixture())
|
|
api_fixture = self.useFixture(nova_fixtures.OSAPIFixture(
|
|
api_version='v2.1'))
|
|
self.api = api_fixture.api
|
|
|
|
# the image fake backend needed for image discovery
|
|
image_fake.stub_out_image_service(self)
|
|
self.addCleanup(image_fake.FakeImageService_reset)
|
|
# We have to get the image before we use 2.latest otherwise we'll get
|
|
# a 404 on the /images proxy API because of 2.36.
|
|
image_id = self.api.get_images()[0]['id']
|
|
# Use the latest microversion available to make sure something does
|
|
# not regress in new microversions; cap as necessary.
|
|
self.api.microversion = 'latest'
|
|
|
|
self.start_service('conductor')
|
|
self.start_service('scheduler')
|
|
self.start_service('compute')
|
|
# The consoleauth service is needed for deleting console tokens when
|
|
# the server is deleted.
|
|
self.start_service('consoleauth')
|
|
|
|
# create two test servers
|
|
self.servers = []
|
|
for x in range(2):
|
|
server = self.api.post_server(
|
|
dict(server=self._build_minimal_create_server_request(
|
|
self.api, 'test-list-server-tag-filters%i' % x, image_id,
|
|
networks='none')))
|
|
self.addCleanup(self.api.delete_server, server['id'])
|
|
server = self._wait_for_state_change(self.api, server, 'ACTIVE')
|
|
self.servers.append(server)
|
|
|
|
# now apply two tags to the first server
|
|
self.two_tag_server = self.servers[0]
|
|
self.api.put_server_tags(self.two_tag_server['id'], ['foo', 'bar'])
|
|
# apply one tag to the second server which intersects with one tag
|
|
# from the first server
|
|
self.one_tag_server = self.servers[1]
|
|
self.api.put_server_tags(self.one_tag_server['id'], ['foo'])
|
|
|
|
def test_list_servers_filter_by_tags(self):
|
|
"""Tests listing servers and filtering by the 'tags' query
|
|
parameter which uses AND logic.
|
|
"""
|
|
servers = self.api.get_servers(search_opts=dict(tags='foo,bar'))
|
|
# we should get back our server that has both tags
|
|
self.assertEqual(1, len(servers))
|
|
server = servers[0]
|
|
self.assertEqual(self.two_tag_server['id'], server['id'])
|
|
self.assertEqual(2, len(server['tags']))
|
|
self.assertEqual(['bar', 'foo'], sorted(server['tags']))
|
|
|
|
# query for the shared tag and we should get two servers back
|
|
servers = self.api.get_servers(search_opts=dict(tags='foo'))
|
|
self.assertEqual(2, len(servers))
|