From 3223cc5943c219ee4e8bc052a10d577655c86f6e Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Sun, 30 Apr 2017 08:49:53 +0300 Subject: [PATCH] NSX|V Fail dist router set gw if edge not found Sometimes during gateway-set the distributed router creation is not done yet, and the edge-id is not found. In this case we should make sure to produce an error before the 'super' method adds the new GW to the DB. Change-Id: I6faa824be3f70ed6f105e12b4fa2614e6f3e5c5f --- vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py b/vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py index 968a672637..91ae5d6144 100644 --- a/vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py +++ b/vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py @@ -165,6 +165,9 @@ class RouterDistributedDriver(router_driver.RouterBaseDriver): self.plugin._get_external_attachment_info( context, router)) + # verify the edge was deployed before calling super code. + tlr_edge_id = self._get_edge_id_or_raise(context, router_id) + super(nsx_v.NsxVPluginV2, self.plugin)._update_router_gw_info( context, router_id, info, router=router) @@ -175,7 +178,6 @@ class RouterDistributedDriver(router_driver.RouterBaseDriver): context, router)) plr_id = self.edge_manager.get_plr_by_tlr_id(context, router_id) - tlr_edge_id = self._get_edge_id(context, router_id) if not new_ext_net_id: if plr_id: # delete all plr relative conf