
Most of this is just removal of unnecessary 'use_neutron=True' conf overrides. The sole exception is the conversion of the metadata API tests, which turned out to be far less effort to convert than I expected. Change-Id: I5114bf13e7df95ed02be70f29d453116387d4f9c Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
75 lines
2.9 KiB
Python
75 lines
2.9 KiB
Python
# 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.tests import fixtures
|
|
from nova.tests.functional.notification_sample_tests \
|
|
import notification_sample_base
|
|
from nova.tests.unit import fake_notifier
|
|
|
|
|
|
class TestServerGroupNotificationSample(
|
|
notification_sample_base.NotificationSampleTestBase):
|
|
|
|
def setUp(self):
|
|
super(TestServerGroupNotificationSample, self).setUp()
|
|
self.neutron = fixtures.NeutronFixture(self)
|
|
self.useFixture(self.neutron)
|
|
|
|
def test_server_group_create_delete(self):
|
|
group_req = {
|
|
"name": "test-server-group",
|
|
"policy": "anti-affinity",
|
|
"rules": {"max_server_per_host": 3}
|
|
}
|
|
group = self.api.post_server_groups(group_req)
|
|
|
|
self.assertEqual(1, len(fake_notifier.VERSIONED_NOTIFICATIONS))
|
|
self._verify_notification(
|
|
'server_group-create',
|
|
replacements={'uuid': group['id']},
|
|
actual=fake_notifier.VERSIONED_NOTIFICATIONS[0])
|
|
|
|
fake_notifier.reset()
|
|
self.api.delete_server_group(group['id'])
|
|
|
|
self.assertEqual(1, len(fake_notifier.VERSIONED_NOTIFICATIONS))
|
|
self._verify_notification(
|
|
'server_group-delete',
|
|
replacements={'uuid': group['id']},
|
|
actual=fake_notifier.VERSIONED_NOTIFICATIONS[0])
|
|
|
|
def test_server_group_add_member(self):
|
|
group_req = {
|
|
"name": "test-server-group",
|
|
"policy": "anti-affinity",
|
|
"rules": {"max_server_per_host": 3}
|
|
}
|
|
group = self.api.post_server_groups(group_req)
|
|
fake_notifier.reset()
|
|
|
|
server = self._boot_a_server(
|
|
extra_params={'networks': [{'port': self.neutron.port_1['id']}]},
|
|
scheduler_hints={"group": group['id']})
|
|
self._wait_for_notification('instance.update')
|
|
# 0: server_group.add_member
|
|
# 1: scheduler-select_destinations-start
|
|
# 2: scheduler-select_destinations-end
|
|
# 3: instance.create.start
|
|
# 4: instance.create.end
|
|
# 5: instance.update
|
|
# (Due to adding server tags in the '_boot_a_server' method.)
|
|
self.assertEqual(6, len(fake_notifier.VERSIONED_NOTIFICATIONS))
|
|
self._verify_notification(
|
|
'server_group-add_member',
|
|
replacements={'uuid': group['id'],
|
|
'members': [server['id']]},
|
|
actual=fake_notifier.VERSIONED_NOTIFICATIONS[0])
|