x
/
poppy
Code Issues Proposed changes

Merge "Correctly populate flavor ID in flavor_ref"

This commit is contained in:
Jenkins 2014-11-14 20:22:48 +00:00 committed by Gerrit Code Review
parent fc3b60d9f9 c80bf65ed4
commit e14f4d6d34
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ CQL_LIST_SERVICES = '''
SELECT project_id,
service_name,
domains,
flavor_id,
origins,
caching_rules,
restrictions,
@ -52,6 +53,7 @@ CQL_GET_SERVICE = '''
SELECT project_id,
service_name,
domains,
flavor_id,
origins,
caching_rules,
restrictions,
@ -322,7 +324,7 @@ class ServicesController(base.ServicesController):
o.get('ssl', False))
for o in origins]
domains = [domain.Domain(d['domain']) for d in domains]
flavor_ref = result.get('flavor_ref')
flavor_ref = result.get('flavor_id')
s = service.Service(name, domains, origins, flavor_ref)
provider_detail_results = result.get('provider_details') or {}
provider_details_dict = {}