Automation Toolkit Release v2024.3.1

Author: unamachi

cd3_automation_toolkit/cd3FirewallValidator.py

@@ -207,7 +207,7 @@ def validate_Firewall(filename,comp_ids,fwpolicy,config,signer, ct):
             columnvalue = str(dffirewall.loc[i, columnname]).strip()
 
             if (columnname == 'Availability Domain(AD1|AD2|AD3|Regional)'):
-                if columnvalue.lower() != 'nan' and columnvalue.upper() not in ["AD1", "AD2", "AD3","Regional"]:
+                if columnvalue.lower() != 'nan' and columnvalue.upper() not in ["AD1", "AD2", "AD3","REGIONAL"]:
                     log(f'ROW {i+3} : Wrong value at column "Availability Domain" - {columnvalue}.')
                     fw_invalid_check = True
 
@@ -1160,6 +1160,4 @@ def validate_firewall_cd3(filename, var_file, prefix, outdir, config,signer,ct):
         print("\n\nSummary:")
         print("=======")
         print("There are no errors in CD3. Please proceed with TF Generation\n")
-        return "No Error"
-
-
+        return "No Error"

cd3_automation_toolkit/commonTools.py

@@ -164,7 +164,7 @@ def get_export_filters(self,export_filters):
                 self.cg_region = (i.split("=")[1])[2:][:-2]
 
             if 'fwl_clone_src_region' in i:
-                self.fwl_clone_src_region = (i.split("=")[1])[2:][:-2]
+                self.fwl_clone_src_region = (i.split("=")[1])[1:][:-1]
 
             if 'src_policy_str' in i:
                 self.src_policy_str = (i.split("=")[1])[2:][:-2]
@@ -179,7 +179,7 @@ def get_export_filters(self,export_filters):
                 self.fwl_name = (i.split("=")[1])[2:][:-2]
 
             if 'fwl_clone_comp' in i:
-                self.fwl_clone_comp = (i.split("=")[1])[2:][:-2]
+                self.fwl_clone_comp = (i.split("=")[1])[1:][:-1]
                 self.fwl_clone_comp = self.fwl_clone_comp if self.fwl_clone_comp else "null"
 
             if 'fwl_del_comp' in i:

jenkins_install/scriptler/scripts/SubChildOptions.groovy

@@ -1,6 +1,6 @@
 List sec_rules = ["<b>SECURITY RULES</b>:disabled","Export Security Rules (From OCI into SecRulesinOCI sheet)", "Add/Modify/Delete Security Rules (Reads SecRulesinOCI sheet)"]
 List route_rules = ["<b>ROUTE RULES</b>:disabled","Export Route Rules (From OCI into RouteRulesinOCI sheet)", "Add/Modify/Delete Route Rules (Reads RouteRulesinOCI sheet)"]
-List firewall_policy = ["<b>FIREWALL POLICY</b>:disabled","Add/Modify Policy", "Add/Modify Service","Add/Modify Service-list","Add/Modify Application","Add/Modify Application-list","Add/Modify Address-list","Add/Modify Url-list","Add/Modify Security rules","Add/Modify Mapped Secrets","Add/Modify Decryption Rules","Add/Modify Decryption Profile"]
+List firewall_policy = ["<b>FIREWALL POLICY</b>:disabled","Add/Modify/Delete Policy", "Add/Modify/Delete Service","Add/Modify/Delete Service-list","Add/Modify/Delete Application","Add/Modify/Delete Application-list","Add/Modify/Delete Address-list","Add/Modify/Delete Url-list","Add/Modify/Delete Security rules","Add/Modify/Delete Mapped Secrets","Add/Modify/Delete Decryption Rules","Add/Modify/Delete Decryption Profile"]
 List drg_route_rules = ["<b>DRG ROUTE RULES</b>:disabled","Export DRG Route Rules (From OCI into DRGRouteRulesinOCI sheet)", "Add/Modify/Delete DRG Route Rules (Reads DRGRouteRulesinOCI sheet)"]
 List nsg = ["<b>NSGs</b>:disabled","Export NSGs (From OCI into NSGs sheet)", "Add/Modify/Delete NSGs (Reads NSGs sheet)"]
 List cis =  ["<b>CIS</b>:disabled","Download latest compliance checking script", "Execute compliance checking script"]