x/vmware-nsx
Code Issues Proposed changes

NSX-V3 Fix router availability zones

Browse Source 
Before getting the router availability zones in get/list actions, we
need to get the availability zone hints.
The get_router method of the plugin is no longer needed becasue it
was originally created only to avoid thios prroblem.
In addition, the availability zones list should also return the router
zones.

Change-Id: Ief40b36955bae771fb1efd72d49be0e5a0d55cc6
This commit is contained in:
Adit Sarfaty 2017-12-21 14:50:24 +02:00
parent 3a1a47a70b
commit c8f1f3859c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -3381,18 +3381,12 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
return ret_val
def get_router(self, context, id, fields=None):
with db_api.context_manager.reader.using(context):
# Get router from Neutron database
router = self._get_router(context, id)
# Don't do field selection here otherwise we won't be able to add
# provider networks fields
rtr = self._make_router_dict(router)
rtr['availability_zones'] = self.get_router_availability_zones(rtr)
return db_utils.resource_fields(rtr, fields)
def get_router_availability_zones(self, router):
"""Return availability zones which a router belongs to."""
# add the hints to the structure first
l3_attrs_db.ExtraAttributesMixin._extend_extra_router_dict(
router, router)
# get the availability zones from the hints
return [self.get_router_az(router).name]
def _validate_ext_routes(self, context, router_id, gw_info, new_routes):
@ -4368,6 +4362,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
for az in self._availability_zones_data.list_availability_zones():
# Add this availability zone as a network resource
result[(az, 'network')] = True
result[(az, 'router')] = True
return result
def _validate_availability_zones_forced(self, context, resource_type,