x/group-based-policy
Code Issues Proposed changes

Merge "Cleanup of Group Policy Redirect Action"

Browse Source
This commit is contained in:
Jenkins
2014-11-01 03:57:12 +00:00
committed by Gerrit Code Review
parent 75d6bfc042 20be39875a
commit f6d74e2968
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gbp/neutron/services/grouppolicy/drivers/resource_mapping.py
View File

@@ -751,7 +751,7 @@ class ResourceMappingDriver(api.PolicyDriver):
def _cleanup_redirect_action(self, context): def _cleanup_redirect_action(self, context):
consumed_contracts = context.current['consumed_contracts'] consumed_contracts = context.current['consumed_contracts']
provided_contracts = context.current['provided_contracts'] provided_contracts = context.current['provided_contracts']
if not provided_contracts or not consumed_contracts: if not provided_contracts and not consumed_contracts:
return return
contracts = provided_contracts + consumed_contracts contracts = provided_contracts + consumed_contracts
for contract_id in contracts: for contract_id in contracts:
@@ -767,13 +767,12 @@ class ResourceMappingDriver(api.PolicyDriver):
contract = context._plugin.get_contract( contract = context._plugin.get_contract(
context._plugin_context, contract_id) context._plugin_context, contract_id)
for rule_id in contract.get('policy_rules'): for rule_id in contract.get('policy_rules'):
chain_id = self._get_rule_servicechain_mapping( chain_id_map = self._get_rule_servicechain_mapping(
context._plugin_context.session, context._plugin_context.session,
rule_id).servicechain_instance_id rule_id)
if not chain_id: if chain_id_map:
continue self._delete_servicechain_instance(
else: context, chain_id_map.servicechain_instance_id)
self._delete_servicechain_instance(context, chain_id)
break # Only one redirect action per rule break # Only one redirect action per rule
# The following methods perform the necessary subset of # The following methods perform the necessary subset of