openstack
/
designate
Code Issues Proposed changes

Merge "Allow for zones / pools with no attributes"

This commit is contained in:
Jenkins 2017-02-01 16:00:58 +00:00 committed by Gerrit Code Review
parent 2c0ecad121 438e39eb8c
commit cdf29c2923
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
designate/scheduler/filters/attribute_filter.py
View File

@ -15,6 +15,7 @@ import six
from oslo_log import log as logging
from oslo_utils.strutils import bool_from_string
from designate import exceptions
from designate.objects import PoolAttributeList
from designate.scheduler.filters import base
@ -57,11 +58,16 @@ class AttributeFilter(base.Filter):
def filter(self, context, pools, zone):
zone_attributes = zone.attributes.to_dict()
try:
zone_attributes = zone.attributes.to_dict()
except exceptions.RelationNotLoaded:
zone_attributes = {}
def evaluate_pool(pool):
pool_attributes = pool.attributes.to_dict()
try:
pool_attributes = pool.attributes.to_dict()
except exceptions.RelationNotLoaded:
pool_attributes = {}
# Check if the keys requested exist in this pool
if not {key for key in six.iterkeys(pool_attributes)}.issuperset(