x
/
vmware-nsx
Code Issues Proposed changes

Merge "NSX|V delete metadata ports upon deleting the dhcp edge"

This commit is contained in:
Jenkins 2016-08-25 10:20:14 +00:00 committed by Gerrit Code Review
parent 7bc1274cbf 1d3c810b1b
commit bea2debf25
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vmware_nsx/plugins/nsx_v/md_proxy.py
View File

@ -23,7 +23,7 @@ from neutron_lib import constants
from oslo_config import cfg
from oslo_log import log as logging
from vmware_nsx._i18n import _, _LE
from vmware_nsx._i18n import _, _LE, _LW
from vmware_nsx.common import exceptions as nsxv_exc
from vmware_nsx.common import locking
from vmware_nsx.common import nsxv_constants
@ -681,13 +681,21 @@ class NsxVMetadataProxyHandler(object):
proxy_lb=False,
context=context)
def cleanup_router_edge(self, rtr_id):
def cleanup_router_edge(self, rtr_id, warn=False):
filters = {
'network_id': [self.internal_net],
'device_id': [rtr_id]}
ports = self.nsxv_plugin.get_ports(self.context, filters=filters)
if ports:
self.nsxv_plugin.delete_port(
self.context, ports[0]['id'],
l3_port_check=False)
if warn:
LOG.warning(_LW("cleanup_router_edge found port %(port)s for "
"router %(router)s - deleting it now."),
{'port': ports[0]['id'], 'router': rtr_id})
try:
self.nsxv_plugin.delete_port(
self.context, ports[0]['id'],
l3_port_check=False)
except Exception as e:
LOG.error(_LE("Failed to delete md_proxy port %(port)s: "
"%(e)s"), {'port': ports[0]['id'], 'e': e})

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

@ -716,6 +716,12 @@ class EdgeManager(object):
def _free_dhcp_edge_appliance(self, context, network_id):
router_id = (vcns_const.DHCP_EDGE_PREFIX + network_id)[:36]
# if there are still metadata ports on this edge - delete them now
metadata_proxy_handler = self.plugin.metadata_proxy_handler
if metadata_proxy_handler:
metadata_proxy_handler.cleanup_router_edge(router_id, warn=True)
self._free_edge_appliance(context, router_id)
def _build_lrouter_name(self, router_id, router_name):