efcc911a6b
Currently the value return from 'utils.aggregate_metadata_get_by_host' is a type of collections.defaultdict(set). That said all the values are 'set' not 'String'. Unfortunately, most of test cases related to aggregate filters are using it with in incorrect way. This patch fixes it and adds an extra test case to verify it. Co-Authored-By: Fei Long Wang <flwang@catalyst.net.nz> Change-Id: I12f033a66ed31cd624bda47be944bab6c841dbf5
51 lines
2.1 KiB
Python
51 lines
2.1 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.
|
|
|
|
import mock
|
|
|
|
from nova import objects
|
|
from nova.scheduler.filters import availability_zone_filter
|
|
from nova import test
|
|
from nova.tests.unit.scheduler import fakes
|
|
|
|
|
|
@mock.patch('nova.scheduler.filters.utils.aggregate_metadata_get_by_host')
|
|
class TestAvailabilityZoneFilter(test.NoDBTestCase):
|
|
|
|
def setUp(self):
|
|
super(TestAvailabilityZoneFilter, self).setUp()
|
|
self.filt_cls = availability_zone_filter.AvailabilityZoneFilter()
|
|
|
|
@staticmethod
|
|
def _make_zone_request(zone):
|
|
return objects.RequestSpec(
|
|
context=mock.sentinel.ctx,
|
|
availability_zone=zone)
|
|
|
|
def test_availability_zone_filter_same(self, agg_mock):
|
|
agg_mock.return_value = {'availability_zone': set(['nova'])}
|
|
request = self._make_zone_request('nova')
|
|
host = fakes.FakeHostState('host1', 'node1', {})
|
|
self.assertTrue(self.filt_cls.host_passes(host, request))
|
|
|
|
def test_availability_zone_filter_same_comma(self, agg_mock):
|
|
agg_mock.return_value = {'availability_zone': set(['nova', 'nova2'])}
|
|
request = self._make_zone_request('nova')
|
|
host = fakes.FakeHostState('host1', 'node1', {})
|
|
self.assertTrue(self.filt_cls.host_passes(host, request))
|
|
|
|
def test_availability_zone_filter_different(self, agg_mock):
|
|
agg_mock.return_value = {'availability_zone': set(['nova'])}
|
|
request = self._make_zone_request('bad')
|
|
host = fakes.FakeHostState('host1', 'node1', {})
|
|
self.assertFalse(self.filt_cls.host_passes(host, request))
|