x/poppy
Code Issues Proposed changes

Merge "Fixes bug: GET and LIST return some empty fields"

Browse Source
This commit is contained in:
Jenkins
2015-01-14 18:34:35 +00:00
committed by Gerrit Code Review
parent 233764140a 576c5ecec9
commit cd5787f8e0
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
poppy/storage/cassandra/services.py
View File

@@ -539,25 +539,33 @@ class ServicesController(base.ServicesController):
domains = [domain.Domain(d['domain'], d.get('protocol', 'http'))
for d in domains]
restrictions = [restriction.Restriction(
r.get('name'),
[rule.Rule(r_rule.get('name'),
referrer=r_rule.get('referrer'))
for r_rule in r['rules']])
for r in restrictions]
restriction_objects = []
for r in restrictions:
restriction_object = restriction.Restriction(r.get('name'))
restriction_object.rules = []
for r_rule in r['rules']:
rule_object = rule.Rule(r_rule.get('name'))
del r_rule['name']
rule_object.from_dict(r_rule)
restriction_object.rules.append(rule_object)
restriction_objects.append(restriction_object)
caching_rules = [cachingrule.CachingRule(
caching_rule.get('name'),
caching_rule.get('ttl'),
[rule.Rule(rule_i.get('name'),
request_url=rule_i.get('request_url'))
for rule_i in caching_rule['rules']])
for caching_rule in caching_rules]
caching_objects = []
for caching_rule in caching_rules:
caching_object = cachingrule.CachingRule(caching_rule.get('name'),
caching_rule.get('ttl'))
caching_object.rules = []
for cr_rule in caching_rule['rules']:
rule_object = rule.Rule(cr_rule.get('name'))
del cr_rule['name']
rule_object.from_dict(cr_rule)
caching_object.rules.append(rule_object)
caching_objects.append(caching_object)
# create the service object
s = service.Service(service_id, name, domains, origins, flavor_id,
caching=caching_rules,
restrictions=restrictions)
caching=caching_objects,
restrictions=restriction_objects)
# format the provider details
provider_detail_results = result.get('provider_details') or {}

3
tests/api/services/test_services.py
View File

@@ -355,7 +355,8 @@ class TestServiceActions(base.TestBase):
u"ttl": 1200,
u"rules": [{
u"name": u"index",
u"request_url": u"/index.htm"
u"request_url": u"/index.htm",
u"http_method": u"GET"
}]
}
]