diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-20 01:05:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-20 01:05:56 +0000 |
| commit | dd28988b57fd6934f3b84173e02b2a53b1ce5fbc (patch) | |
| tree | b5bdf8953be27615fdfe759aef8b8ee4789a7be8 /nova/tests/scheduler/test_host_filters.py | |
| parent | d18e14d2875f5ffbed1f180495008568772fcbae (diff) | |
| parent | 8ce8e4b6c0d38057c3ed93b08377cfab7461f65d (diff) | |
| download | nova-dd28988b57fd6934f3b84173e02b2a53b1ce5fbc.tar.gz nova-dd28988b57fd6934f3b84173e02b2a53b1ce5fbc.tar.xz nova-dd28988b57fd6934f3b84173e02b2a53b1ce5fbc.zip | |
Merge "Enhance compute capability filter to check multi-level"
Diffstat (limited to 'nova/tests/scheduler/test_host_filters.py')
| -rw-r--r-- | nova/tests/scheduler/test_host_filters.py | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index 84667eb9e..e6d068d57 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -731,6 +731,27 @@ class HostFiltersTestCase(test.TestCase): especs={'opt1': '1', 'opt2': '222', 'trust:trusted_host': 'true'}, passes=False) + def test_compute_filter_pass_extra_specs_simple_with_scope(self): + self._do_test_compute_filter_extra_specs( + ecaps={'opt1': '1', 'opt2': '2'}, + especs={'capabilities:opt1': '1', + 'trust:trusted_host': 'true'}, + passes=True) + + def test_compute_filter_extra_specs_simple_with_wrong_scope(self): + self._do_test_compute_filter_extra_specs( + ecaps={'opt1': '1', 'opt2': '2'}, + especs={'wrong_scope:opt1': '1', + 'trust:trusted_host': 'true'}, + passes=True) + + def test_compute_filter_extra_specs_pass_multi_level_with_scope(self): + self._do_test_compute_filter_extra_specs( + ecaps={'opt1': {'a': '1', 'b': {'aa': '2'}}, 'opt2': '2'}, + especs={'opt1:a': '1', 'capabilities:opt1:b:aa': '2', + 'trust:trusted_host': 'true'}, + passes=True) + def test_aggregate_filter_passes_no_extra_specs(self): self._stub_service_is_up(True) filt_cls = self.class_map['AggregateInstanceExtraSpecsFilter']() |