x/vmware-nsx
Code Issues Proposed changes

Merge "Fix cleanup upon metadata failure"

Browse Source
This commit is contained in:
Jenkins 2015-07-21 08:58:35 +00:00 committed by Gerrit Code Review
commit d186c36403
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py
View File

@ -111,6 +111,7 @@ class NsxVPluginV2(agents_db.AgentDbMixin,
def __init__(self): def __init__(self):
super(NsxVPluginV2, self).__init__() super(NsxVPluginV2, self).__init__()
self.metadata_proxy_handler = None
config.validate_nsxv_config_options() config.validate_nsxv_config_options()
neutron_extensions.append_api_extensions_path([vmware.NSX_EXT_PATH]) neutron_extensions.append_api_extensions_path([vmware.NSX_EXT_PATH])
@ -141,9 +142,9 @@ class NsxVPluginV2(agents_db.AgentDbMixin,
and cfg.CONF.nsxv.mgt_net_moid and cfg.CONF.nsxv.mgt_net_moid
and cfg.CONF.nsxv.mgt_net_proxy_ips and cfg.CONF.nsxv.mgt_net_proxy_ips
and cfg.CONF.nsxv.mgt_net_proxy_netmask) and cfg.CONF.nsxv.mgt_net_proxy_netmask)
self.metadata_proxy_handler = ( if has_metadata_cfg:
nsx_v_md_proxy.NsxVMetadataProxyHandler(self) self.metadata_proxy_handler = (
if has_metadata_cfg else None) nsx_v_md_proxy.NsxVMetadataProxyHandler(self))
def _create_security_group_container(self): def _create_security_group_container(self):
name = "OpenStack Security Group container" name = "OpenStack Security Group container"

44
vmware_nsx/neutron/plugins/vmware/plugins/nsx_v_md_proxy.py
View File

@ -23,7 +23,6 @@ from neutron.common import constants
from neutron import context as neutron_context from neutron import context as neutron_context
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import excutils
from neutron.i18n import _LE from neutron.i18n import _LE
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsxv_exc from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsxv_exc
@ -151,18 +150,18 @@ class NsxVMetadataProxyHandler:
internal_net, internal_subnet = ( internal_net, internal_subnet = (
self._create_metadata_internal_network(INTERNAL_SUBNET)) self._create_metadata_internal_network(INTERNAL_SUBNET))
except Exception as e: except Exception as e:
with excutils.save_and_reraise_exception(): nsxv_db.delete_nsxv_internal_network(
nsxv_db.delete_nsxv_internal_network( self.context.session,
self.context.session, vcns_const.InternalEdgePurposes.INTER_EDGE_PURPOSE)
vcns_const.InternalEdgePurposes.INTER_EDGE_PURPOSE)
# if network is created, clean up # if network is created, clean up
if internal_net: if internal_net:
self.nsxv_plugin.delete_network(self.context, self.nsxv_plugin.delete_network(self.context,
internal_net) internal_net)
LOG.exception(_LE("Exception %s while creating internal " LOG.exception(_LE("Exception %s while creating internal "
"network for metadata service"), e) "network for metadata service"), e)
return
# Update the new network_id in DB # Update the new network_id in DB
nsxv_db.create_nsxv_internal_network( nsxv_db.create_nsxv_internal_network(
@ -382,16 +381,23 @@ class NsxVMetadataProxyHandler:
return edge_ip return edge_ip
except Exception as e: except Exception as e:
with excutils.save_and_reraise_exception(): LOG.exception(_LE("Exception %s while creating internal edge "
LOG.exception(_LE("Exception %s while creating internal edge " "for metadata service"), e)
"for metadata service"), e)
nsxv_db.delete_nsxv_internal_edge( ports = self.nsxv_plugin.get_ports(
self.context.session, self.context, filters={'device_id': [rtr_id]})
rtr_ext_ip)
if rtr_id: for port in ports:
self.nsxv_plugin.delete_router(self.context, rtr_id) self.nsxv_plugin.delete_port(self.context, port['id'],
l3_port_check=True,
nw_gw_port_check=True)
nsxv_db.delete_nsxv_internal_edge(
self.context.session,
rtr_ext_ip)
if rtr_id:
self.nsxv_plugin.delete_router(self.context, rtr_id)
def _get_address_groups(self, context, network_id, device_id, is_proxy): def _get_address_groups(self, context, network_id, device_id, is_proxy):