Replace SortedDict with OrderedDict
Starting with Django 1.9 SortedDict has been removed completely, and this is currently blocking the gate. This patch replaces SortedDict with the python native OrderedDict. Closes-Bug: #1696072 Change-Id: I2206fe5807e578b80cc5bf5c38d2556c2adad0b9
This commit is contained in:
parent
b355b6b5e8
commit
5de128d2ef
|
@ -14,7 +14,8 @@
|
||||||
|
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.utils.datastructures import SortedDict
|
import collections
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from horizon import messages
|
from horizon import messages
|
||||||
|
@ -473,13 +474,13 @@ def _pool_list(request, expand_subnet=False, expand_vip=False, **kwargs):
|
||||||
pools = neutronclient(request).list_pools(**kwargs).get('pools')
|
pools = neutronclient(request).list_pools(**kwargs).get('pools')
|
||||||
if expand_subnet:
|
if expand_subnet:
|
||||||
subnets = neutron.subnet_list(request)
|
subnets = neutron.subnet_list(request)
|
||||||
subnet_dict = SortedDict((s.id, s) for s in subnets)
|
subnet_dict = collections.OrderedDict((s.id, s) for s in subnets)
|
||||||
for p in pools:
|
for p in pools:
|
||||||
subnet = subnet_dict.get(p['subnet_id'])
|
subnet = subnet_dict.get(p['subnet_id'])
|
||||||
p['subnet_name'] = subnet.cidr if subnet else None
|
p['subnet_name'] = subnet.cidr if subnet else None
|
||||||
if expand_vip:
|
if expand_vip:
|
||||||
vips = vip_list(request)
|
vips = vip_list(request)
|
||||||
vip_dict = SortedDict((v.id, v) for v in vips)
|
vip_dict = collections.OrderedDict((v.id, v) for v in vips)
|
||||||
for p in pools:
|
for p in pools:
|
||||||
p['vip_name'] = _get_vip(request, p, vip_dict,
|
p['vip_name'] = _get_vip(request, p, vip_dict,
|
||||||
expand_name_only=True)
|
expand_name_only=True)
|
||||||
|
@ -629,7 +630,7 @@ def _member_list(request, expand_pool, **kwargs):
|
||||||
members = neutronclient(request).list_members(**kwargs).get('members')
|
members = neutronclient(request).list_members(**kwargs).get('members')
|
||||||
if expand_pool:
|
if expand_pool:
|
||||||
pools = _pool_list(request)
|
pools = _pool_list(request)
|
||||||
pool_dict = SortedDict((p.id, p) for p in pools)
|
pool_dict = collections.OrderedDict((p.id, p) for p in pools)
|
||||||
for m in members:
|
for m in members:
|
||||||
m['pool_name'] = pool_dict.get(m['pool_id']).name_or_id
|
m['pool_name'] = pool_dict.get(m['pool_id']).name_or_id
|
||||||
return [Member(m) for m in members]
|
return [Member(m) for m in members]
|
||||||
|
|
Loading…
Reference in New Issue