x/poppy
Code Issues Proposed changes

fix: Duplicated country code when country code is missing

Browse Source 
Change-Id: I51c82e1e8536d4af0833b909a0ea14bac3d16e9b
This commit is contained in:
tonytan4ever
2016-01-14 16:46:53 -05:00
parent 110aff8d78
commit abcbadea8a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
poppy/provider/akamai/services.py
View File

@@ -854,11 +854,16 @@ class ServiceController(base.ServiceBase):
zones_list.append(rule_entry.geography)
# NOTE(tonytan4ever):Too many country code to check and maybe more
# countries in the future, so put in checking duplicates logic here
res = ' '.join(
['%s' % geo_zone_code_mapping.COUNTRY_CODE_MAPPING.get(
zone, '') for zone in zones_list])
if len(res) > len(set(res)):
raise ValueError("Duplicated country code in %s" % str(res))
country_code_list = [
'%s' %
geo_zone_code_mapping.COUNTRY_CODE_MAPPING.get(zone, '')
for zone in zones_list
if geo_zone_code_mapping.COUNTRY_CODE_MAPPING.get(zone, '')
!= '']
if len(country_code_list) > len(set(country_code_list)):
raise ValueError("Duplicated country code in %s" %
str(country_code_list))
res = ' '.join(country_code_list)
return res
def _process_caching_rules(self, caching_rules, rules_list):