x/vmware-nsx
Code Issues Proposed changes

NSX|V: ensure that static bindings are consistent

Browse Source 
Ensure that the bindings in the DB are consistent with those
configured on the edge.

Change-Id: I53d819d1e9f873971802ba96e5264c390385610a
This commit is contained in:
Gary Kotton 2017-01-30 09:36:05 +02:00
parent 6ccae5b9ae
commit ef0eda4076
2 changed files with 51 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmware_nsx/db/nsxv_db.py
View File

@ -333,6 +333,12 @@ def delete_edge_dhcp_static_binding(session, edge_id, mac_address):
edge_id=edge_id, mac_address=mac_address).delete() edge_id=edge_id, mac_address=mac_address).delete()
def delete_edge_dhcp_static_binding_id(session, edge_id, binding_id):
with session.begin(subtransactions=True):
session.query(nsxv_models.NsxvEdgeDhcpStaticBinding).filter_by(
edge_id=edge_id, binding_id=binding_id).delete()
def get_nsxv_dhcp_bindings_count_per_edge(session): def get_nsxv_dhcp_bindings_count_per_edge(session):
return ( return (
session.query( session.query(

63
vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
View File

@ -1881,10 +1881,26 @@ class EdgeManager(object):
context.session, edge_id, mac_address) context.session, edge_id, mac_address)
if dhcp_binding: if dhcp_binding:
with locking.LockManager.get_lock(str(edge_id)): with locking.LockManager.get_lock(str(edge_id)):
self.nsxv_manager.vcns.delete_dhcp_binding( # We need to read the binding from the NSX to check that
edge_id, dhcp_binding.binding_id) # we are not deleting a updated entry. This may be the
nsxv_db.delete_edge_dhcp_static_binding( # result of a async nova create and nova delete and the
context.session, edge_id, mac_address) # same port IP is selected
binding = get_dhcp_binding_for_binding_id(
self.nsxv_manager, edge_id, dhcp_binding.binding_id)
# The hostname is the port_id so we have a unique
# identifier
if binding and binding['hostname'] == port_id:
self.nsxv_manager.vcns.delete_dhcp_binding(
edge_id, dhcp_binding.binding_id)
else:
LOG.warning(_LW("Failed to find binding on edge "
"%(edge_id)s for port "
"%(port_id)s with %(binding_id)s"),
{'edge_id': edge_id,
'port_id': port_id,
'binding_id': dhcp_binding.binding_id})
nsxv_db.delete_edge_dhcp_static_binding(
context.session, edge_id, mac_address)
else: else:
LOG.warning(_LW("Failed to find dhcp binding on edge " LOG.warning(_LW("Failed to find dhcp binding on edge "
"%(edge_id)s to DELETE for port " "%(edge_id)s to DELETE for port "
@ -1897,11 +1913,14 @@ class EdgeManager(object):
{'port_id': port_id}) {'port_id': port_id})
@vcns.retry_upon_exception(nsxapi_exc.VcnsApiException, max_delay=10) @vcns.retry_upon_exception(nsxapi_exc.VcnsApiException, max_delay=10)
def _create_dhcp_binding(self, edge_id, binding): def _create_dhcp_binding(self, context, edge_id, binding):
try: try:
with locking.LockManager.get_lock(str(edge_id)): h, c = self.nsxv_manager.vcns.create_dhcp_binding(
h, c = self.nsxv_manager.vcns.create_dhcp_binding( edge_id, binding)
edge_id, binding) binding_id = h['location'].split('/')[-1]
nsxv_db.create_edge_dhcp_static_binding(
context.session, edge_id,
binding['macAddress'], binding_id)
except nsxapi_exc.VcnsApiException as e: except nsxapi_exc.VcnsApiException as e:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
binding_id = None binding_id = None
@ -1928,10 +1947,11 @@ class EdgeManager(object):
LOG.debug("Overlapping hostname %s with binding %s", LOG.debug("Overlapping hostname %s with binding %s",
binding['hostname'], binding_id) binding['hostname'], binding_id)
if binding_id: if binding_id:
with locking.LockManager.get_lock(str(edge_id)): self.nsxv_manager.vcns.delete_dhcp_binding(
self.nsxv_manager.vcns.delete_dhcp_binding( edge_id, binding_id)
edge_id, binding_id) nsxv_db.delete_edge_dhcp_static_binding_id(
return h['location'].split('/')[-1] context.session, edge_id, binding_id)
return binding_id
def create_dhcp_bindings(self, context, port_id, network_id, bindings): def create_dhcp_bindings(self, context, port_id, network_id, bindings):
edge_id = get_dhcp_edge_id(context, network_id) edge_id = get_dhcp_edge_id(context, network_id)
@ -1952,10 +1972,9 @@ class EdgeManager(object):
configured_bindings = [] configured_bindings = []
try: try:
for binding in bindings: for binding in bindings:
binding_id = self._create_dhcp_binding(edge_id, binding) with locking.LockManager.get_lock(str(edge_id)):
nsxv_db.create_edge_dhcp_static_binding( binding_id = self._create_dhcp_binding(
context.session, edge_id, context, edge_id, binding)
binding['macAddress'], binding_id)
configured_bindings.append((binding_id, configured_bindings.append((binding_id,
binding['macAddress'])) binding['macAddress']))
except nsxapi_exc.VcnsApiException: except nsxapi_exc.VcnsApiException:
@ -1964,8 +1983,8 @@ class EdgeManager(object):
with locking.LockManager.get_lock(str(edge_id)): with locking.LockManager.get_lock(str(edge_id)):
self.nsxv_manager.vcns.delete_dhcp_binding( self.nsxv_manager.vcns.delete_dhcp_binding(
edge_id, binding_id) edge_id, binding_id)
nsxv_db.delete_edge_dhcp_static_binding( nsxv_db.delete_edge_dhcp_static_binding(
context.session, edge_id, mac_address) context.session, edge_id, mac_address)
else: else:
LOG.warning(_LW("Failed to create dhcp bindings since dhcp edge " LOG.warning(_LW("Failed to create dhcp bindings since dhcp edge "
"for net %s not found at the backend"), "for net %s not found at the backend"),
@ -2083,6 +2102,14 @@ def get_dhcp_binding_mappings_for_hostname(nsxv_manager, edge_id):
return bindings_get return bindings_get
def get_dhcp_binding_for_binding_id(nsxv_manager, edge_id, binding_id):
dhcp_config = query_dhcp_service_config(nsxv_manager, edge_id)
if dhcp_config:
for binding in dhcp_config['staticBindings']['staticBindings']:
if binding['bindingId'] == binding_id:
return binding
def query_dhcp_service_config(nsxv_manager, edge_id): def query_dhcp_service_config(nsxv_manager, edge_id):
"""Retrieve the current DHCP configuration from the edge.""" """Retrieve the current DHCP configuration from the edge."""
_, dhcp_config = nsxv_manager.vcns.query_dhcp_configuration(edge_id) _, dhcp_config = nsxv_manager.vcns.query_dhcp_configuration(edge_id)