x/vmware-nsx
Code Issues Proposed changes

Merge "Octavia driver: L7 policy delete cascade"

Browse Source
This commit is contained in:
Zuul 2021-05-03 12:22:32 +00:00 committed by Gerrit Code Review
commit 885c053728
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vmware_nsx/services/lbaas/octavia/octavia_listener.py
View File

@ -12,7 +12,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import copy
import socket import socket
import time import time
@ -334,10 +334,18 @@ class NSXOctaviaListenerEndpoint(object):
listener['loadbalancer'] = loadbalancer listener['loadbalancer'] = loadbalancer
listener_dict[listener['id']] = listener listener_dict[listener['id']] = listener
for policy in listener.get('l7policies', []): for policy in listener.get('l7policies', []):
dummy_policy = copy.deepcopy(policy)
policy['listener'] = listener
for rule in policy.get('rules', []): for rule in policy.get('rules', []):
if not rule.get('policy'):
rule['policy'] = dummy_policy
LOG.info("Delete cascade: deleting l7 rule of lb %s", LOG.info("Delete cascade: deleting l7 rule of lb %s",
loadbalancer['id']) loadbalancer['id'])
self.l7rule.delete_cascade(ctx, rule, dummy_completor) self.l7rule.delete_cascade(ctx, rule, dummy_completor)
for r in dummy_policy['rules']:
if r['l7rule_id'] == rule['l7rule_id']:
dummy_policy['rules'].remove(r)
break
LOG.info("Delete cascade: deleting l7 policy of lb %s", LOG.info("Delete cascade: deleting l7 policy of lb %s",
loadbalancer['id']) loadbalancer['id'])
self.l7policy.delete_cascade(ctx, policy, dummy_completor) self.l7policy.delete_cascade(ctx, policy, dummy_completor)