x/vmware-nsx
Code Issues Proposed changes

NSXv: Fix method name typo

Browse Source 
TrivialFix

Change-Id: I4b4041409502eb91e7ed29aa68c81d70002d725c
This commit is contained in:
Kobi Samoray 2017-07-18 10:54:52 +03:00
parent 19c083c057
commit 908908e93b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1928,7 +1928,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
return self._update_port(context, id, port, original_port, return self._update_port(context, id, port, original_port,
is_compute_port, device_id) is_compute_port, device_id)
def _update_dhcp_adddress(self, context, network_id): def _update_dhcp_address(self, context, network_id):
with locking.LockManager.get_lock('dhcp-update-%s' % network_id): with locking.LockManager.get_lock('dhcp-update-%s' % network_id):
address_groups = self._create_network_dhcp_address_group( address_groups = self._create_network_dhcp_address_group(
context, network_id) context, network_id)
@ -2070,8 +2070,8 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
self._create_dhcp_static_binding(context, ret_port) self._create_dhcp_static_binding(context, ret_port)
elif owner == constants.DEVICE_OWNER_DHCP: elif owner == constants.DEVICE_OWNER_DHCP:
# Update the ip of the dhcp port # Update the ip of the dhcp port
self._update_dhcp_adddress(context, self._update_dhcp_address(context,
ret_port['network_id']) ret_port['network_id'])
elif (owner == constants.DEVICE_OWNER_ROUTER_GW or elif (owner == constants.DEVICE_OWNER_ROUTER_GW or
owner == constants.DEVICE_OWNER_ROUTER_INTF): owner == constants.DEVICE_OWNER_ROUTER_INTF):
# This is a router port - update the edge appliance # This is a router port - update the edge appliance
@ -2332,7 +2332,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
self._delete_dhcp_edge_service(context, network_id) self._delete_dhcp_edge_service(context, network_id)
else: else:
# Update address group and delete the DHCP port only # Update address group and delete the DHCP port only
self._update_dhcp_adddress(context, network_id) self._update_dhcp_address(context, network_id)
def _is_overlapping_reserved_subnets(self, subnet): def _is_overlapping_reserved_subnets(self, subnet):
"""Return True if the subnet overlaps with reserved subnets. """Return True if the subnet overlaps with reserved subnets.
@ -2608,7 +2608,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
network_id) network_id)
self._delete_dhcp_edge_service(context, network_id) self._delete_dhcp_edge_service(context, network_id)
return return
self._update_dhcp_adddress(context, network_id) self._update_dhcp_address(context, network_id)
def _get_conflict_network_ids_by_overlapping(self, context, subnets): def _get_conflict_network_ids_by_overlapping(self, context, subnets):
with locking.LockManager.get_lock('nsx-networking'): with locking.LockManager.get_lock('nsx-networking'):
@ -2706,7 +2706,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
self.edge_manager.create_dhcp_edge_service(context, network_id, self.edge_manager.create_dhcp_edge_service(context, network_id,
subnet) subnet)
# Create all dhcp ports within the network # Create all dhcp ports within the network
self._update_dhcp_adddress(context, network_id) self._update_dhcp_address(context, network_id)
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():