Skip to content

Commit

Permalink
Merge pull request #277 from pvelumul/configpush_changes
Browse files Browse the repository at this point in the history 
checking whether string has '::' before spliting. fixing the issue in…
  • Loading branch information
@michsmit99
michsmit99 committed Jan 14, 2017
2 parents f411be4 + 591075c commit ab8673d
Showing 1 changed file with 37 additions and 31 deletions.
68 changes: 37 additions & 31 deletions applications/configpush/apicservice.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,10 @@ def delete_unwanted_contracts(self, apic):
(contract_policy.descr.count('"') +
contract_policy.descr.count("'") +
contract_policy.descr.count('/'))]
if existing_contract.descr.split("::")[1] == contract_policy.descr.split(
"::")[1] and existing_contract.descr.split("::")[0] == contract_policy.descr.split("::")[0]:
matched = True
if "::" in existing_contract.descr and "::" in contract_policy.descr :
if existing_contract.descr.split("::")[1] == contract_policy.descr.split(
"::")[1] and existing_contract.descr.split("::")[0] == contract_policy.descr.split("::")[0]:
matched = True
if not matched:
self.prompt_and_mark_as_deleted(apic, existing_contract)
exist_contract_providing_epgs = existing_contract.get_all_providing_epgs()
Expand Down Expand Up @@ -1067,18 +1068,19 @@ def removing_unwanted_filter_relations(self, apic):
# removing the unwanted contractsubject filters for each contract subject
for contract_policy in self.cdb.get_contract_policies():
for existing_contract in existing_contracts:
if existing_contract.descr != "" and existing_contract.descr.split("::")[1] == contract_policy.descr.split(
"::")[1] and existing_contract.descr.split("::")[0] == contract_policy.descr.split("::")[0]:
for child_contractSubject in existing_contract.get_children(ContractSubject):
for child_filter in child_contractSubject.get_filters():
matched = False
for whitelist_policy in contract_policy.get_whitelist_policies():
entry_name = whitelist_policy.proto + '.' + whitelist_policy.port_min + '.' + whitelist_policy.port_max
if child_filter.name == entry_name + '_Filter':
matched = True
continue
if not matched:
self.prompt_and_remove_relation(apic, child_contractSubject, child_filter)
if existing_contract.descr != "" and "::" in existing_contract.descr and "::" in contract_policy.descr :
if existing_contract.descr.split("::")[1] == contract_policy.descr.split(
"::")[1] and existing_contract.descr.split("::")[0] == contract_policy.descr.split("::")[0]:
for child_contractSubject in existing_contract.get_children(ContractSubject):
for child_filter in child_contractSubject.get_filters():
matched = False
for whitelist_policy in contract_policy.get_whitelist_policies():
entry_name = whitelist_policy.proto + '.' + whitelist_policy.port_min + '.' + whitelist_policy.port_max
if child_filter.name == entry_name + '_Filter':
matched = True
continue
if not matched:
self.prompt_and_remove_relation(apic, child_contractSubject, child_filter)
if self.displayonly:
print json.dumps(tenant.get_json(), indent=4, sort_keys=True)
return 'OK'
Expand Down Expand Up @@ -1118,10 +1120,11 @@ def push_remaining_contracts_along_with_filters(self, apic, THROTTLE_SIZE):
for contract_policy in self.cdb.get_contract_policies():
matched = False
for existing_contract in existing_contracts:
if existing_contract.descr != "" and existing_contract.descr.split("::")[1] == contract_policy.descr.split(
"::")[1] and existing_contract.descr.split("::")[0] == contract_policy.descr.split("::")[0]:
matched = True
break
if "::" in existing_contract.descr and "::" in contract_policy.descr:
if existing_contract.descr != "" and existing_contract.descr.split("::")[1] == contract_policy.descr.split(
"::")[1] and existing_contract.descr.split("::")[0] == contract_policy.descr.split("::")[0]:
matched = True
break
child_filters = []
if matched:
contract = existing_contract
Expand Down Expand Up @@ -1466,10 +1469,11 @@ def pushing_remaining_epgs(self, tenant, app, bd=None, base_epg=None):
matched = False
for existing_epg in existing_epgs:
if existing_epg.name != "base":
if existing_epg.descr.split(":")[1] == epg_policy.descr.split(
":")[1] and existing_epg.descr.split(":")[0] == epg_policy.descr.split(":")[0]:
matched = True
break
if ":" in existing_epg.descr and ":" in epg_policy.descr:
if existing_epg.descr.split(":")[1] == epg_policy.descr.split(
":")[1] and existing_epg.descr.split(":")[0] == epg_policy.descr.split(":")[0]:
matched = True
break

if matched is True:
epg = existing_epg
Expand Down Expand Up @@ -1648,10 +1652,11 @@ def push_config_to_apic(self):
matched = False
for existing_epg in existing_epgs:
if existing_epg.name != "base":
if existing_epg.descr.split(":")[1] == epg_policy.descr.split(
":")[1] and existing_epg.descr.split(":")[0] == epg_policy.descr.split(":")[0]:
matched = True
break
if ":" in existing_epg.descr and ":" in epg_policy.descr :
if existing_epg.descr.split(":")[1] == epg_policy.descr.split(
":")[1] and existing_epg.descr.split(":")[0] == epg_policy.descr.split(":")[0]:
matched = True
break

if matched is True:
epg = existing_epg
Expand Down Expand Up @@ -1690,10 +1695,11 @@ def push_config_to_apic(self):
for l3out_epg_policy in self.cdb.get_l3out_policies():
matched = False
for existing_outside_epg in existing_outside_epgs:
if existing_outside_epg.descr.split(":")[1] == l3out_epg_policy.descr.split(
":")[1] and existing_outside_epg.descr.split(":")[0] == l3out_epg_policy.descr.split(":")[0]:
matched = True
break
if ":" in existing_outside_epg.descr and ":" in l3out_epg_policy.descr :
if existing_outside_epg.descr.split(":")[1] == l3out_epg_policy.descr.split(
":")[1] and existing_outside_epg.descr.split(":")[0] == l3out_epg_policy.descr.split(":")[0]:
matched = True
break
if matched is True:
epg = existing_outside_epg
self.consume_and_provide_contracts_for_epgs(l3out_epg_policy, epg, tenant)
Expand Down

0 comments on commit ab8673d

Please sign in to comment.