x/vmware-nsx
Code Issues Proposed changes

Merge "Recreate metadata route after VDR gateway is set"

Browse Source
This commit is contained in:
Jenkins 2015-06-30 15:06:16 +00:00 committed by Gerrit Code Review
commit 542fcc711c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1119,12 +1119,13 @@ class NsxVPluginV2(agents_db.AgentDbMixin,
self.edge_manager.update_dhcp_edge_service(
context, network_id, address_groups=address_groups)
if resource_id and self.metadata_proxy_handler:
LOG.debug('Update metadata for resource %s', resource_id)
self.metadata_proxy_handler.configure_router_edge(resource_id,
context)
if resource_id:
if self.metadata_proxy_handler:
LOG.debug('Update metadata for resource %s', resource_id)
self.metadata_proxy_handler.configure_router_edge(
resource_id, context)
self.setup_dhcp_edge_fw_rules(context, self, resource_id)
self.setup_dhcp_edge_fw_rules(context, self, resource_id)
except Exception:
with excutils.save_and_reraise_exception():

5
vmware_nsx/neutron/plugins/vmware/plugins/nsx_v_drivers/distributed_router_driver.py
View File

@ -171,6 +171,8 @@ class RouterDistributedDriver(router_driver.RouterBaseDriver):
# update static routes in all
self.update_routes(context, router_id, newnexthop)
if self.plugin.metadata_proxy_handler:
self._metadata_route_setup(context, router_id)
def add_router_interface(self, context, router_id, interface_info):
info = super(nsx_v.NsxVPluginV2, self.plugin).add_router_interface(
@ -233,7 +235,8 @@ class RouterDistributedDriver(router_driver.RouterBaseDriver):
# Get all subnets which are attached to the VDR and have DHCP enabled
vdr_ports = self.plugin.get_ports(
context,
filters={'device_id': [router_id]},
filters={'device_id': [router_id],
'enable_dhcp': True},
fields=['fixed_ips'])
vdr_subnets = [port['fixed_ips'][0]['subnet_id'] for port in vdr_ports]