Add functional test for deleting a compute service
This adds a functional test which asserts the things
related to bug 1756179 where deleting a compute service
does not also delete the related host mapping or resource
provider resources.
Also related to bug 1763183 in that it should not be
possible to delete a compute service that has instances
running on it since that will mess up resource tracking
in Placement.
NOTE(mriedem): There are two changes in this backport:
1. The ResourceClass fields moved in Rocky via change
Iea182341f9419cb514a044f76864d6bec60a3683.
2. The _get_provider_inventory method was added in change
I5ee11274816cd9e4f0669e9e52468a29262c9020 in Rocky.
Change-Id: I519c5abfe24b154998f481c8a86db239a75d4729
Related-Bug: #1756179
Related-Bug: #1763183
(cherry picked from commit a80ac96362)
This commit is contained in:
Matt Riedemann
parent
bf0a069773
commit
bcd462e49b
|
|
@ -1473,6 +1473,10 @@ class ProviderUsageBaseTestCase(test.TestCase,
|
|||
'/resource_providers/%s/traits' % rp_uuid,
|
||||
put_traits_req, version='1.6')
|
||||
|
||||
def _get_provider_inventory(self, rp_uuid):
|
||||
return self.placement_api.get(
|
||||
'/resource_providers/%s/inventories' % rp_uuid).body['inventories']
|
||||
|
||||
def assertFlavorMatchesAllocation(self, flavor, allocation):
|
||||
self.assertEqual(flavor['vcpus'], allocation['VCPU'])
|
||||
self.assertEqual(flavor['ram'], allocation['MEMORY_MB'])
|
||||
|
|
|
|||
|
|
@ -0,0 +1,114 @@
|
|||
# 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 context as nova_context
|
||||
from nova import objects
|
||||
from nova.objects import fields as rc_fields
|
||||
from nova.tests.functional import test_servers
|
||||
|
||||
|
||||
class TestServicesAPI(test_servers.ProviderUsageBaseTestCase):
|
||||
compute_driver = 'fake.SmallFakeDriver'
|
||||
|
||||
def test_compute_service_delete_ensure_related_cleanup(self):
|
||||
"""Tests deleting a compute service and the related cleanup associated
|
||||
with that like the compute_nodes table entry, removing the host
|
||||
from any aggregates, the host mapping in the API DB and the associated
|
||||
resource provider in Placement.
|
||||
"""
|
||||
compute = self._start_compute('host1')
|
||||
# Make sure our compute host is represented as expected.
|
||||
services = self.admin_api.get_services(binary='nova-compute')
|
||||
self.assertEqual(1, len(services))
|
||||
service = services[0]
|
||||
|
||||
# Now create a host aggregate and add our host to it.
|
||||
aggregate = self.admin_api.post_aggregate(
|
||||
{'aggregate': {'name': 'agg1'}})
|
||||
self.admin_api.add_host_to_aggregate(aggregate['id'], service['host'])
|
||||
# Make sure the host is in the aggregate.
|
||||
aggregate = self.admin_api.api_get(
|
||||
'/os-aggregates/%s' % aggregate['id']).body['aggregate']
|
||||
self.assertEqual([service['host']], aggregate['hosts'])
|
||||
|
||||
rp_uuid = self._get_provider_uuid_by_host(service['host'])
|
||||
|
||||
# We'll know there is a host mapping implicitly if os-hypervisors
|
||||
# returned something in _get_provider_uuid_by_host, but let's also
|
||||
# make sure the host mapping is there like we expect.
|
||||
ctxt = nova_context.get_admin_context()
|
||||
objects.HostMapping.get_by_host(ctxt, service['host'])
|
||||
|
||||
# Make sure there is a resource provider for that compute node based
|
||||
# on the uuid.
|
||||
resp = self.placement_api.get('/resource_providers/%s' % rp_uuid)
|
||||
self.assertEqual(200, resp.status)
|
||||
|
||||
# Make sure the resource provider has inventory.
|
||||
inventories = self._get_provider_inventory(rp_uuid)
|
||||
# Expect a minimal set of inventory for the fake virt driver.
|
||||
for resource_class in [rc_fields.ResourceClass.VCPU,
|
||||
rc_fields.ResourceClass.MEMORY_MB,
|
||||
rc_fields.ResourceClass.DISK_GB]:
|
||||
self.assertIn(resource_class, inventories)
|
||||
|
||||
# Now create a server so that the resource provider has some allocation
|
||||
# records.
|
||||
flavor = self.api.get_flavors()[0]
|
||||
server = self._boot_and_check_allocations(flavor, service['host'])
|
||||
|
||||
# Now the fun part, delete the compute service and make sure related
|
||||
# resources are cleaned up, like the compute node, host mapping, and
|
||||
# resource provider. We have to first stop the compute service so
|
||||
# it doesn't recreate the compute node during the
|
||||
# update_available_resource periodic task.
|
||||
self.admin_api.put_service(service['id'], {'forced_down': True})
|
||||
compute.stop()
|
||||
# FIXME(mriedem): This is bug 1763183 where the compute node has
|
||||
# an instance running on it but we allow you to delete the service
|
||||
# and compute node anyway, which will affect the allocations for the
|
||||
# instance and orphans the compute node resource provider in Placement.
|
||||
# Once the bug is fixed, this should fail until the instance is either
|
||||
# migrated or deleted.
|
||||
self.admin_api.api_delete('/os-services/%s' % service['id'])
|
||||
|
||||
# Make sure the service is deleted.
|
||||
services = self.admin_api.get_services(binary='nova-compute')
|
||||
self.assertEqual(0, len(services))
|
||||
|
||||
# Make sure the host was removed from the aggregate.
|
||||
aggregate = self.admin_api.api_get(
|
||||
'/os-aggregates/%s' % aggregate['id']).body['aggregate']
|
||||
self.assertEqual([], aggregate['hosts'])
|
||||
|
||||
# Trying to get the hypervisor should result in a 404.
|
||||
self.admin_api.api_get(
|
||||
'os-hypervisors?hypervisor_hostname_pattern=%s' % service['host'],
|
||||
check_response_status=[404])
|
||||
|
||||
# FIXME(mriedem): This is bug 1756179 where the host mapping is not
|
||||
# deleted. Once the bug is fixed, we should be able to change this
|
||||
# to assert that HostMappingNotFound is raised.
|
||||
objects.HostMapping.get_by_host(ctxt, service['host'])
|
||||
|
||||
# FIXME(mriedem): This is bug 1756179 where the compute node resource
|
||||
# provider is not deleted. Once the bug is fixed, this should result
|
||||
# in a 404 response.
|
||||
resp = self.placement_api.get('/resource_providers/%s' % rp_uuid)
|
||||
self.assertEqual(200, resp.status)
|
||||
# Assert the allocations still exist for the server against the
|
||||
# compute node resource provider. Once the bug is fixed, there should
|
||||
# be no allocations for the server.
|
||||
allocations = self._get_allocations_by_server_uuid(server['id'])
|
||||
self.assertEqual(1, len(allocations))
|
||||
allocation = allocations[rp_uuid]['resources']
|
||||
self.assertFlavorMatchesAllocation(flavor, allocation)
|
||||
Loading…
Reference in New Issue