Automation Toolkit Release v2024.2.0

Author: bhlohumi

cd3_automation_toolkit/Compute/export_instances_nonGreenField.py

@@ -151,6 +151,8 @@ def __get_instances_info(compartment_name, compartment_id, reg_name, display_nam
                     bdet = None
                     boot_details = ''
                     bvp = []
+                    print("Skipping instance "+ins_dname +" bacause of faulty Boot Volume")
+                    continue
 
             bkp_policy_name = ""
 

cd3_automation_toolkit/Security/Firewall/export_firewallpolicy_nonGreenField.py

@@ -630,13 +630,13 @@ def export_firewallpolicy(inputfile, _outdir, service_dir, config, signer, ct, e
 
     # Read CD3
     df, values_for_column_fwpolicy = commonTools.read_cd3(cd3file, sheetname)
-    df, values_for_column_fwaddress = commonTools.read_cd3(cd3file, "Firewall-Policy-Address")
-    df, values_for_column_fwurllist = commonTools.read_cd3(cd3file, "Firewall-Policy-Urllist")
-    df, values_for_column_fwservicelist = commonTools.read_cd3(cd3file, "Firewall-Policy-Servicelist")
-    df, values_for_column_fwapplist = commonTools.read_cd3(cd3file, "Firewall-Policy-Applicationlist")
-    df, values_for_column_fwsecrules = commonTools.read_cd3(cd3file, "Firewall-Policy-Secrules")
-    df, values_for_column_fwsecret = commonTools.read_cd3(cd3file, "Firewall-Policy-Secrets")
-    df, values_for_column_fwdecryptprofile = commonTools.read_cd3(cd3file, "Firewall-Policy-Decryptprofile")
+    df, values_for_column_fwaddress = commonTools.read_cd3(cd3file, "Firewall-Policy-AddressList")
+    df, values_for_column_fwurllist = commonTools.read_cd3(cd3file, "Firewall-Policy-UrlList")
+    df, values_for_column_fwservicelist = commonTools.read_cd3(cd3file, "Firewall-Policy-ServiceList")
+    df, values_for_column_fwapplist = commonTools.read_cd3(cd3file, "Firewall-Policy-ApplicationList")
+    df, values_for_column_fwsecrules = commonTools.read_cd3(cd3file, "Firewall-Policy-SecRule")
+    df, values_for_column_fwsecret = commonTools.read_cd3(cd3file, "Firewall-Policy-Secret")
+    df, values_for_column_fwdecryptprofile = commonTools.read_cd3(cd3file, "Firewall-Policy-DecryptProfile")
     df, values_for_column_fwdecryptrule = commonTools.read_cd3(cd3file, "Firewall-Policy-DecryptRule")
 
     # Get dict for columns from Excel_Columns
@@ -713,23 +713,23 @@ def export_firewallpolicy(inputfile, _outdir, service_dir, config, signer, ct, e
 
     if clone:
         commonTools.write_to_cd3(values_for_column_fwpolicy, cd3file, "Firewall-Policy",append=True)
-        commonTools.write_to_cd3(values_for_column_fwaddress, cd3file, "Firewall-Policy-Address",append=True)
-        commonTools.write_to_cd3(values_for_column_fwurllist, cd3file, "Firewall-Policy-Urllist",append=True)
-        commonTools.write_to_cd3(values_for_column_fwservicelist, cd3file, "Firewall-Policy-Servicelist",append=True)
-        commonTools.write_to_cd3(values_for_column_fwapplist, cd3file, "Firewall-Policy-Applicationlist",append=True)
-        commonTools.write_to_cd3(values_for_column_fwsecrules, cd3file, "Firewall-Policy-Secrules",append=True)
-        commonTools.write_to_cd3(values_for_column_fwsecret, cd3file, "Firewall-Policy-Secrets",append=True)
-        commonTools.write_to_cd3(values_for_column_fwdecryptprofile, cd3file, "Firewall-Policy-Decryptprofile",append=True)
+        commonTools.write_to_cd3(values_for_column_fwaddress, cd3file, "Firewall-Policy-AddressList",append=True)
+        commonTools.write_to_cd3(values_for_column_fwurllist, cd3file, "Firewall-Policy-UrlList",append=True)
+        commonTools.write_to_cd3(values_for_column_fwservicelist, cd3file, "Firewall-Policy-ServiceList",append=True)
+        commonTools.write_to_cd3(values_for_column_fwapplist, cd3file, "Firewall-Policy-ApplicationList",append=True)
+        commonTools.write_to_cd3(values_for_column_fwsecrules, cd3file, "Firewall-Policy-SecRule",append=True)
+        commonTools.write_to_cd3(values_for_column_fwsecret, cd3file, "Firewall-Policy-Secret",append=True)
+        commonTools.write_to_cd3(values_for_column_fwdecryptprofile, cd3file, "Firewall-Policy-DecryptProfile",append=True)
         commonTools.write_to_cd3(values_for_column_fwdecryptrule, cd3file, "Firewall-Policy-DecryptRule",append=True)
     else:
         commonTools.write_to_cd3(values_for_column_fwpolicy, cd3file, "Firewall-Policy")
-        commonTools.write_to_cd3(values_for_column_fwaddress, cd3file, "Firewall-Policy-Address")
-        commonTools.write_to_cd3(values_for_column_fwurllist, cd3file, "Firewall-Policy-Urllist")
-        commonTools.write_to_cd3(values_for_column_fwservicelist, cd3file, "Firewall-Policy-Servicelist")
-        commonTools.write_to_cd3(values_for_column_fwapplist, cd3file, "Firewall-Policy-Applicationlist")
-        commonTools.write_to_cd3(values_for_column_fwsecrules, cd3file, "Firewall-Policy-Secrules")
-        commonTools.write_to_cd3(values_for_column_fwsecret, cd3file, "Firewall-Policy-Secrets")
-        commonTools.write_to_cd3(values_for_column_fwdecryptprofile, cd3file, "Firewall-Policy-Decryptprofile")
+        commonTools.write_to_cd3(values_for_column_fwaddress, cd3file, "Firewall-Policy-AddressList")
+        commonTools.write_to_cd3(values_for_column_fwurllist, cd3file, "Firewall-Policy-UrlList")
+        commonTools.write_to_cd3(values_for_column_fwservicelist, cd3file, "Firewall-Policy-ServiceList")
+        commonTools.write_to_cd3(values_for_column_fwapplist, cd3file, "Firewall-Policy-ApplicationList")
+        commonTools.write_to_cd3(values_for_column_fwsecrules, cd3file, "Firewall-Policy-SecRule")
+        commonTools.write_to_cd3(values_for_column_fwsecret, cd3file, "Firewall-Policy-Secret")
+        commonTools.write_to_cd3(values_for_column_fwdecryptprofile, cd3file, "Firewall-Policy-DecryptProfile")
         commonTools.write_to_cd3(values_for_column_fwdecryptrule, cd3file, "Firewall-Policy-DecryptRule")
 
         print("Firewall Policies exported to CD3\n")

cd3_automation_toolkit/Security/Firewall/fw_create.py

@@ -22,7 +22,7 @@ def fw_create(inputfile, outdir, service_dir, prefix, ct):
     # Load the template file
     file_loader = FileSystemLoader(f'{Path(__file__).parent}/templates')
     env = Environment(loader=file_loader, keep_trailing_newline=True)
-    firewall = env.get_template('firewall-template')
+    firewall = env.get_template('firewalls-template')
     ADS = ["AD1", "AD2", "AD3"]
 
     sheetName = "Firewall"

cd3_automation_toolkit/Security/Firewall/fwpolicy_create.py

@@ -23,7 +23,7 @@ def firewallpolicy_create(inputfile, outdir, service_dir, prefix, ct):
     #print (inputfile, outdir, prefix, config, service_dir)
     file_loader = FileSystemLoader(f'{Path(__file__).parent}/templates')
     env = Environment(loader=file_loader, keep_trailing_newline=True)
-    policy = env.get_template('policy-template')
+    policy = env.get_template('firewall-policies-template')
 
 
     sheetName = "Firewall-Policy"

cd3_automation_toolkit/Security/Firewall/fwpolicy_create_address.py

@@ -23,10 +23,10 @@ def fwpolicy_create_address(inputfile, outdir, service_dir, prefix, ct):
     #print (inputfile, outdir, prefix, config, service_dir)
     file_loader = FileSystemLoader(f'{Path(__file__).parent}/templates')
     env = Environment(loader=file_loader, keep_trailing_newline=True)
-    address = env.get_template('policy-address-template')
+    address = env.get_template('policy-addresslists-template')
 
 
-    sheetName = "Firewall-Policy-Address"
+    sheetName = "Firewall-Policy-AddressList"
     address_auto_tfvars_filename = prefix + "_"+sheetName.lower()+".auto.tfvars"
 
     filename = inputfile

cd3_automation_toolkit/Security/Firewall/fwpolicy_create_applicationlist.py

@@ -23,10 +23,10 @@ def fwpolicy_create_applicationlist(inputfile, outdir, service_dir, prefix, ct):
     #print(inputfile, outdir, prefix, config, service_dir)
     file_loader = FileSystemLoader(f'{Path(__file__).parent}/templates')
     env = Environment(loader=file_loader, keep_trailing_newline=True)
-    applicationlist = env.get_template('policy-applicationlist-template')
+    applicationlist = env.get_template('policy-applicationlists-template')
 
 
-    sheetName = "Firewall-Policy-Applicationlist"
+    sheetName = "Firewall-Policy-ApplicationList"
     applicationlist_auto_tfvars_filename = prefix + "_firewall-policy-applicationlist.auto.tfvars"
     filename = inputfile
 

cd3_automation_toolkit/Security/Firewall/fwpolicy_create_apps.py

@@ -26,8 +26,8 @@ def fwpolicy_create_apps(inputfile, outdir, service_dir, prefix, ct):
     applications = env.get_template('policy-apps-template')
 
 
-    sheetName = "Firewall-Policy-Applicationlist"
-    apps_auto_tfvars_filename = prefix + "_firewall-policy-apps.auto.tfvars"
+    sheetName = "Firewall-Policy-ApplicationList"
+    apps_auto_tfvars_filename = prefix + "_firewall-policy-application.auto.tfvars"
 
     filename = inputfile
 

cd3_automation_toolkit/Security/Firewall/fwpolicy_create_decryptionprofile.py

@@ -23,10 +23,10 @@ def fwpolicy_create_decryptionprofile(inputfile, outdir, service_dir, prefix, ct
     #print (inputfile, outdir, prefix, config, service_dir)
     file_loader = FileSystemLoader(f'{Path(__file__).parent}/templates')
     env = Environment(loader=file_loader, keep_trailing_newline=True)
-    decryptionprofile = env.get_template('policy-decryptionprofile-template')
+    decryptionprofile = env.get_template('policy-decryptionprofiles-template')
 
 
-    sheetName = "Firewall-Policy-Decryptprofile"
+    sheetName = "Firewall-Policy-DecryptProfile"
     decryptionprofile_auto_tfvars_filename = prefix + "_"+sheetName.lower()+".auto.tfvars"
 
     filename = inputfile

cd3_automation_toolkit/Security/Firewall/fwpolicy_create_secret.py

@@ -23,10 +23,10 @@ def fwpolicy_create_secret(inputfile, outdir, service_dir, prefix, ct):
     #print (inputfile, outdir, prefix, config, service_dir)
     file_loader = FileSystemLoader(f'{Path(__file__).parent}/templates')
     env = Environment(loader=file_loader, keep_trailing_newline=True)
-    secret = env.get_template('policy-secret-template')
+    secret = env.get_template('policy-secrets-template')
 
 
-    sheetName = "Firewall-Policy-Secrets"
+    sheetName = "Firewall-Policy-Secret"
     secret_auto_tfvars_filename = prefix + "_"+sheetName.lower()+".auto.tfvars"
 
     filename = inputfile
@@ -108,9 +108,9 @@ def fwpolicy_create_secret(inputfile, outdir, service_dir, prefix, ct):
             if columnname == "Vault Secret Id":
                 if columnvalue != '':
                     secret_id = str(columnvalue).strip().split("::")
-                    secret_tf_id = secret_id[1]
-                    vault_tf_name = secret_id[0]
-                tempdict = {'secret_tf_id': secret_tf_id, 'vault_tf_name': vault_tf_name}
+                    vault_secret_name = secret_id[1]
+                    vault_name = secret_id[0]
+                tempdict = {'vault_secret_name': vault_secret_name, 'vault_name': vault_name}
 
             if columnname == "Version Number":
                 version_number = columnvalue

cd3_automation_toolkit/Security/Firewall/fwpolicy_create_secrules.py

@@ -26,7 +26,7 @@ def fwpolicy_create_secrules(inputfile, outdir, service_dir, prefix, ct):
     secrules = env.get_template('policy-secrules-template')
 
 
-    sheetName = "Firewall-Policy-Secrules"
+    sheetName = "Firewall-Policy-SecRule"
     secrules_auto_tfvars_filename = prefix + "_"+sheetName.lower()+".auto.tfvars"
 
     filename = inputfile