Skip to content

Commit 4899292

Browse files
committed
Automation Toolkit Release v2024.2.0
1 parent 01a7d0a commit 4899292

15 files changed

+143
-143
lines changed

cd3_automation_toolkit/Security/Firewall/cloneexport_firewallpolicy_nonGreenField.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
oci_obj_names = {}
2525

2626

27-
def print_firewall_policy(region, ct, values_for_column_fwpolicy, fwpolicys, fwpolicy_compartment_name, policy_detail):
27+
def print_firewall_policy(region, ct, values_for_column_fwpolicy, fwpolicies, fwpolicy_compartment_name, policy_detail):
2828
print("Exporting Policy details for " + region )
2929
importCommands[reg].write("\n\n######### Writing import for Network firewall Policy #########\n\n")
30-
for eachfwpolicydata in fwpolicys:
30+
for eachfwpolicydata in fwpolicies:
3131
for eachfwpolicy in eachfwpolicydata.data:
3232
fwpolicy_display_name = eachfwpolicy.display_name
3333
tf_name = commonTools.check_tf_variable(fwpolicy_display_name)
@@ -48,10 +48,10 @@ def print_firewall_policy(region, ct, values_for_column_fwpolicy, fwpolicys, fwp
4848

4949
return values_for_column_fwpolicy
5050

51-
def print_firewall_address(region, ct, values_for_column_fwaddress, fwpolicys, fwpolicy, policy_detail):
51+
def print_firewall_address(region, ct, values_for_column_fwaddress, fwpolicies, fwpolicy, policy_detail):
5252
importCommands[reg].write("\n\n######### Writing import for Network firewall Address Objects #########\n\n")
5353
print("Exporting Address-list details " + region)
54-
for eachfwpolicydata in fwpolicys:
54+
for eachfwpolicydata in fwpolicies:
5555
for policy in eachfwpolicydata.data:
5656
policy_id = policy.id
5757
addpolicy_display_name = policy.display_name
@@ -90,10 +90,10 @@ def print_firewall_address(region, ct, values_for_column_fwaddress, fwpolicys, f
9090

9191
return values_for_column_fwaddress
9292

93-
def print_firewall_urllist(region, ct, values_for_column_fwurllist, fwpolicys, fwpolicy, policy_detail):
93+
def print_firewall_urllist(region, ct, values_for_column_fwurllist, fwpolicies, fwpolicy, policy_detail):
9494
importCommands[reg].write("\n\n######### Writing import for Network firewall url list Objects #########\n\n")
9595
print("Exporting Url-list details " + region)
96-
for eachfwpolicydata in fwpolicys:
96+
for eachfwpolicydata in fwpolicies:
9797
for urlpolicy in eachfwpolicydata.data:
9898
urlpolicy_id = urlpolicy.id
9999
urlpolicy_display_name = urlpolicy.display_name
@@ -127,10 +127,10 @@ def print_firewall_urllist(region, ct, values_for_column_fwurllist, fwpolicys, f
127127

128128
return values_for_column_fwurllist
129129

130-
def print_firewall_servicelist(region, ct, values_for_column_fwservicelist, fwpolicys, fwpolicy, policy_detail):
130+
def print_firewall_servicelist(region, ct, values_for_column_fwservicelist, fwpolicies, fwpolicy, policy_detail):
131131
importCommands[reg].write("\n\n######### Writing import for Network firewall service list Objects #########\n\n")
132132
print("Exporting Service-list details " + region)
133-
for eachfwpolicydata in fwpolicys:
133+
for eachfwpolicydata in fwpolicies:
134134
for servicelistpolicy in eachfwpolicydata.data:
135135
servicelistpolicy_id = servicelistpolicy.id
136136
servicelistpolicy_display_name = servicelistpolicy.display_name
@@ -178,10 +178,10 @@ def print_firewall_servicelist(region, ct, values_for_column_fwservicelist, fwpo
178178

179179
return values_for_column_fwservicelist
180180

181-
def print_firewall_applist(region, ct, values_for_column_fwapplist, fwpolicys, fwpolicy, policy_detail):
181+
def print_firewall_applist(region, ct, values_for_column_fwapplist, fwpolicies, fwpolicy, policy_detail):
182182
importCommands[reg].write("\n\n######### Writing import for Network firewall application list Objects #########\n\n")
183183
print("Exporting Application-list details " + region)
184-
for eachfwpolicydata in fwpolicys:
184+
for eachfwpolicydata in fwpolicies:
185185
for applistpolicy in eachfwpolicydata.data:
186186
applistpolicy_id = applistpolicy.id
187187
applistpolicy_display_name = applistpolicy.display_name
@@ -225,10 +225,10 @@ def print_firewall_applist(region, ct, values_for_column_fwapplist, fwpolicys, f
225225

226226
return values_for_column_fwapplist
227227

228-
def print_firewall_secrules(region, ct, values_for_column_fwsecrules, fwpolicys, fwpolicy, policy_detail):
228+
def print_firewall_secrules(region, ct, values_for_column_fwsecrules, fwpolicies, fwpolicy, policy_detail):
229229
importCommands[reg].write("\n\n######### Writing import for Network firewall Security Rules Objects #########\n\n")
230230
print("Exporting Security rules details " + region)
231-
for eachfwpolicydata in fwpolicys:
231+
for eachfwpolicydata in fwpolicies:
232232
for secrulespolicy in eachfwpolicydata.data:
233233
secrulespolicy_id = secrulespolicy.id
234234
secrulespolicy_display_name = secrulespolicy.display_name
@@ -313,10 +313,10 @@ def print_firewall_secrules(region, ct, values_for_column_fwsecrules, fwpolicys,
313313
values_for_column_fwsecrules = commonTools.export_tags(applistpolicy, col_header,values_for_column_fwsecrules)
314314

315315
return values_for_column_fwsecrules
316-
def print_firewall_secret(region, ct, values_for_column_fwsecret, fwpolicys, fwpolicy, vault, compartment, policy_detail,kmsvault):
316+
def print_firewall_secret(region, ct, values_for_column_fwsecret, fwpolicies, fwpolicy, vault, compartment, policy_detail,kmsvault):
317317
importCommands[reg].write("\n\n######### Writing import for Network firewall Mapped Secret Objects #########\n\n")
318318
print("Exporting Mapped secret details " + region)
319-
for eachfwpolicydata in fwpolicys:
319+
for eachfwpolicydata in fwpolicies:
320320
for secretpolicy in eachfwpolicydata.data:
321321
secretpolicy_id = secretpolicy.id
322322
secretpolicy_display_name = secretpolicy.display_name
@@ -355,10 +355,10 @@ def print_firewall_secret(region, ct, values_for_column_fwsecret, fwpolicys, fwp
355355

356356
return values_for_column_fwsecret
357357

358-
def print_firewall_decryptprofile(region, ct, values_for_column_fwdecryptprofile, fwpolicys, fwpolicy, policy_detail):
358+
def print_firewall_decryptprofile(region, ct, values_for_column_fwdecryptprofile, fwpolicies, fwpolicy, policy_detail):
359359
importCommands[reg].write("\n\n######### Writing import for Network firewall Decrypt profile Objects #########\n\n")
360360
print("Exporting Decryption Profile details " + region)
361-
for eachfwpolicydata in fwpolicys:
361+
for eachfwpolicydata in fwpolicies:
362362
for decryptionprofile in eachfwpolicydata.data:
363363
decryptionprofile_id = decryptionprofile.id
364364
decryptionprofile_display_name = decryptionprofile.display_name
@@ -417,10 +417,10 @@ def print_firewall_decryptprofile(region, ct, values_for_column_fwdecryptprofile
417417
values_for_column_fwdecryptprofile = commonTools.export_tags(decryptionprofile, col_header,values_for_column_fwdecryptprofile)
418418

419419
return values_for_column_fwdecryptprofile
420-
def print_firewall_decryptrule(region, ct, values_for_column_fwdecryptrule, fwpolicys, fwpolicy, policy_detail):
420+
def print_firewall_decryptrule(region, ct, values_for_column_fwdecryptrule, fwpolicies, fwpolicy, policy_detail):
421421
importCommands[reg].write("\n\n######### Writing import for Network firewall decryption Rules Objects #########\n\n")
422422
print("Exporting Decryption rules details " + region)
423-
for eachfwpolicydata in fwpolicys:
423+
for eachfwpolicydata in fwpolicies:
424424
for decryptrulepolicy in eachfwpolicydata.data:
425425
decryptrulepolicy_id = decryptrulepolicy.id
426426
decryptrulepolicy_display_name = decryptrulepolicy.display_name
@@ -556,19 +556,19 @@ def cloneexport_firewallpolicy(inputfile, _outdir, service_dir, config, signer,
556556
region = reg.capitalize()
557557

558558
for compartment_name in export_compartments:
559-
fwpolicys = []
559+
fwpolicies = []
560560
data = oci.pagination.list_call_get_all_results(fwpolicy.list_network_firewall_policies, compartment_id=ct.ntk_compartment_ids[compartment_name], lifecycle_state="ACTIVE")
561-
fwpolicys.append(data)
561+
fwpolicies.append(data)
562562
fwaddress = oci.pagination.list_call_get_all_results(fwpolicy.list_network_firewall_policies, compartment_id=ct.ntk_compartment_ids[compartment_name], lifecycle_state="ACTIVE")
563-
values_for_column_fwpolicy = print_firewall_policy(region, ct, values_for_column_fwpolicy, fwpolicys, compartment_name, policy_detail)
564-
values_for_column_fwaddress = print_firewall_address(region, ct, values_for_column_fwaddress, fwpolicys, fwpolicy, policy_detail)
565-
values_for_column_fwurllist = print_firewall_urllist(region, ct, values_for_column_fwurllist, fwpolicys, fwpolicy, policy_detail)
566-
values_for_column_fwservicelist = print_firewall_servicelist(region, ct, values_for_column_fwservicelist, fwpolicys, fwpolicy, policy_detail)
567-
values_for_column_fwapplist = print_firewall_applist(region, ct, values_for_column_fwapplist, fwpolicys, fwpolicy, policy_detail)
568-
values_for_column_fwsecrules = print_firewall_secrules(region, ct, values_for_column_fwsecrules,fwpolicys, fwpolicy, policy_detail)
569-
values_for_column_fwsecret = print_firewall_secret(region, ct, values_for_column_fwsecret, fwpolicys,fwpolicy, vault, compartment, policy_detail, kmsvault)
570-
values_for_column_fwdecryptprofile = print_firewall_decryptprofile(region, ct,values_for_column_fwdecryptprofile,fwpolicys, fwpolicy, policy_detail)
571-
values_for_column_fwdecryptrule = print_firewall_decryptrule(region, ct, values_for_column_fwdecryptrule,fwpolicys, fwpolicy, policy_detail)
563+
values_for_column_fwpolicy = print_firewall_policy(region, ct, values_for_column_fwpolicy, fwpolicies, compartment_name, policy_detail)
564+
values_for_column_fwaddress = print_firewall_address(region, ct, values_for_column_fwaddress, fwpolicies, fwpolicy, policy_detail)
565+
values_for_column_fwurllist = print_firewall_urllist(region, ct, values_for_column_fwurllist, fwpolicies, fwpolicy, policy_detail)
566+
values_for_column_fwservicelist = print_firewall_servicelist(region, ct, values_for_column_fwservicelist, fwpolicies, fwpolicy, policy_detail)
567+
values_for_column_fwapplist = print_firewall_applist(region, ct, values_for_column_fwapplist, fwpolicies, fwpolicy, policy_detail)
568+
values_for_column_fwsecrules = print_firewall_secrules(region, ct, values_for_column_fwsecrules,fwpolicies, fwpolicy, policy_detail)
569+
values_for_column_fwsecret = print_firewall_secret(region, ct, values_for_column_fwsecret, fwpolicies,fwpolicy, vault, compartment, policy_detail, kmsvault)
570+
values_for_column_fwdecryptprofile = print_firewall_decryptprofile(region, ct,values_for_column_fwdecryptprofile,fwpolicies, fwpolicy, policy_detail)
571+
values_for_column_fwdecryptrule = print_firewall_decryptrule(region, ct, values_for_column_fwdecryptrule,fwpolicies, fwpolicy, policy_detail)
572572

573573

574574
commonTools.write_to_cd3(values_for_column_fwpolicy, cd3file, "Firewall-Policy")

cd3_automation_toolkit/Security/Firewall/export_firewall_nonGreenField.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def print_firewall(region, ct, values_for_column_fw, fws, fw_compartment_name, v
2525
for eachfw in fws.data:
2626
fw_display_name = eachfw.display_name
2727
tf_name = commonTools.check_tf_variable(fw_display_name)
28-
importCommands[reg].write("\nterraform import \"module.firewall[\\\"" + str(tf_name) + "\\\"].oci_network_firewall_network_firewall.network_firewall\" "+eachfw.id)
28+
importCommands[reg].write("\nterraform import \"module.firewalls[\\\"" + str(tf_name) + "\\\"].oci_network_firewall_network_firewall.network_firewall\" "+eachfw.id)
2929
# Fetch subnet and Compartment name
3030
comp_done_ids = []
3131
subnet_ocid = eachfw.subnet_id
@@ -155,7 +155,7 @@ def export_firewall(inputfile, _outdir, service_dir, config, signer, ct, export_
155155

156156
for compartment_name in export_compartments:
157157
fws = oci.pagination.list_call_get_all_results(fw.list_network_firewalls, compartment_id=ct.ntk_compartment_ids[compartment_name], lifecycle_state="ACTIVE")
158-
# fwpolicys = oci.pagination.list_call_get_all_results(fwpolicy.list_network_firewall_policies,compartment_id=ct.ntk_compartment_ids[compartment_name],lifecycle_state = "ACTIVE")
158+
# fwpolicies = oci.pagination.list_call_get_all_results(fwpolicy.list_network_firewall_policies,compartment_id=ct.ntk_compartment_ids[compartment_name],lifecycle_state = "ACTIVE")
159159

160160
values_for_column_fw = print_firewall(region, ct, values_for_column_fw, fws, compartment_name, vcn, fw)
161161

0 commit comments

Comments
 (0)