x/vmware-nsx
Code Issues Proposed changes

Merge "LBaaSv2: Delete fails while LB in ERROR state"

Browse Source
This commit is contained in:
Jenkins 2016-04-07 03:46:55 +00:00 committed by Gerrit Code Review
commit b92098b1bc
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vmware_nsx/services/lbaas/nsx_v/v2/loadbalancer_mgr.py
View File

@ -71,11 +71,14 @@ class EdgeLoadBalancerManager(base_mgr.EdgeLoadbalancerBaseManager):
try:
binding = nsxv_db.get_nsxv_lbaas_loadbalancer_binding(
context.session, lb.id)
lb_common.del_vip_fw_rule(self.vcns, binding['edge_id'],
binding['edge_fw_rule_id'])
lb_common.del_vip_as_secondary_ip(self.vcns, binding['edge_id'],
lb.vip_address)
nsxv_db.del_nsxv_lbaas_loadbalancer_binding(context.session, lb.id)
if binding:
lb_common.del_vip_fw_rule(self.vcns, binding['edge_id'],
binding['edge_fw_rule_id'])
lb_common.del_vip_as_secondary_ip(self.vcns,
binding['edge_id'],
lb.vip_address)
nsxv_db.del_nsxv_lbaas_loadbalancer_binding(context.session,
lb.id)
self.lbv2_driver.load_balancer.successful_completion(
context, lb, delete=True)
except nsxv_exc.VcnsApiException: