x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|v fix get_network_availability_zones method signature"

Browse Source
This commit is contained in:
Jenkins
2016-12-04 15:07:48 +00:00
committed by Gerrit Code Review
parent bc4b409138 c20985c040
commit fb60430e37
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vmware_nsx/plugins/nsx_v/plugin.py
View File

@@ -599,7 +599,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
# update availability zones # update availability zones
network[az_ext.AVAILABILITY_ZONES] = ( network[az_ext.AVAILABILITY_ZONES] = (
self.get_network_availability_zones(context, network)) self._get_network_availability_zones(context, network))
def _get_subnet_as_providers(self, context, subnet): def _get_subnet_as_providers(self, context, subnet):
net_id = subnet.get('network_id') net_id = subnet.get('network_id')
@@ -2519,9 +2519,12 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
# fallback # fallback
return nsx_az.DEFAULT_NAME return nsx_az.DEFAULT_NAME
def get_network_availability_zones(self, context, net_db): def get_network_availability_zones(self, net_db):
"""Return availability zones which a network belongs to.""" context = n_context.get_admin_context()
return self._get_network_availability_zones(context, net_db)
def _get_network_availability_zones(self, context, net_db):
"""Return availability zones which a network belongs to."""
resource_id = (vcns_const.DHCP_EDGE_PREFIX + net_db["id"])[:36] resource_id = (vcns_const.DHCP_EDGE_PREFIX + net_db["id"])[:36]
dhcp_edge_binding = nsxv_db.get_nsxv_router_binding( dhcp_edge_binding = nsxv_db.get_nsxv_router_binding(
context.session, resource_id) context.session, resource_id)