openstack
/
charm-nova-cloud-controller
Code Issues Proposed changes

Merge "Drop RetryFilter in Victoria inline with upstream"

This commit is contained in:
Zuul 2020-10-01 20:26:25 +00:00 committed by Gerrit Code Review
parent 1beb8444b4 2205b650f4
commit 2ff7d726a0
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hooks/nova_cc_context.py
View File

@ -359,6 +359,16 @@ _pike_enabled_filters = [
"DifferentHostFilter",
"SameHostFilter",
]
_victoria_enabled_filters = [
"AvailabilityZoneFilter",
"ComputeFilter",
"ComputeCapabilitiesFilter",
"ImagePropertiesFilter",
"ServerGroupAntiAffinityFilter",
"ServerGroupAffinityFilter",
"DifferentHostFilter",
"SameHostFilter",
]
def default_enabled_filters():
@ -370,6 +380,8 @@ def default_enabled_filters():
"""
os_rel = ch_utils.os_release('nova-common')
cmp_os_rel = ch_utils.CompareOpenStackReleases(os_rel)
if cmp_os_rel >= 'victoria':
return _victoria_enabled_filters
if cmp_os_rel >= 'pike':
return _pike_enabled_filters
return _base_enabled_filters

5
unit_tests/test_nova_cc_contexts.py
View File

@ -693,3 +693,8 @@ class NovaComputeContextTests(CharmTestCase):
self.os_release.return_value = 'rocky'
self.assertEqual(context.default_enabled_filters(),
context._pike_enabled_filters)
def test_default_enabled_filters_victoria(self):
self.os_release.return_value = 'victoria'
self.assertEqual(context.default_enabled_filters(),
context._victoria_enabled_filters)