Automation Toolkit Release v2024.4.1

Author: xs2suruchi

Dockerfile

@@ -15,6 +15,7 @@ RUN microdnf install -y sudo && \
     chown -R $USERNAME:$USERNAME /cd3user/tenancies/ && \
     microdnf install -y vim && \
     microdnf install -y dnf && \
+    microdnf install -y graphviz && \
     echo 'alias vi="vim"' >> /etc/bashrc
 
 USER $USERNAME

cd3_automation_toolkit/Compute/export_instances_nonGreenField.py

@@ -371,8 +371,8 @@ def export_instances(inputfile, outdir, service_dir,config1, signer1, ct, export
 
         tempStrKeys = "\n" + tempStrKeys
         tempStrKeys = "#START_instance_ssh_keys#" + tempStrKeys + "\t#instance_ssh_keys_END#"
-        if ("\\n" in tempStrKeys):
-            tempStrKeys = tempStrKeys.replace("\\n", "\\\\n")
+        if ("\\" in tempStrKeys):
+            tempStrKeys = tempStrKeys.replace("\\", "\\\\")
 
         var_data[reg] = re.sub('#START_instance_ssh_keys#.*?#instance_ssh_keys_END#', tempStrKeys,
                                var_data[reg],flags=re.DOTALL)

cd3_automation_toolkit/Network/BaseNetwork/export_network_nonGreenField.py

@@ -1051,6 +1051,10 @@ def export_subnets_vlans(inputfile, outdir, service_dir, config, signer, ct, exp
         if (os.path.exists(outdir + "/" + reg + "/" + service_dir_vlan + "/"+vlan_file_name)):
             commonTools.backup_file(outdir + "/" + reg + "/" + service_dir_vlan, "import_network",vlan_file_name)
         importCommands_vlan[reg] = open(outdir + "/" + reg + "/" + service_dir_vlan + "/" + vlan_file_name, "w")
+        importCommands_vlan[reg].write("\n#!/bin/bash")
+        importCommands_vlan[reg].write("\n")
+        importCommands_vlan[reg].write(f'{tf_or_tofu} init')
+        importCommands_vlan[reg].write("\n\n######### Writing import for VLANs #########\n\n")
 
     print("Tab- 'SubnetsVLANs' would be overwritten during export process!!!")
     for reg in export_regions:
@@ -1124,10 +1128,6 @@ def export_subnets_vlans(inputfile, outdir, service_dir, config, signer, ct, exp
                     # VLAN Data
                     if skip_vlans['reg'] == 1:
                         continue
-                    importCommands_vlan[reg].write("#!/bin/bash")
-                    importCommands_vlan[reg].write("\n")
-                    importCommands_vlan[reg].write(f'{tf_or_tofu} init')
-                    importCommands_vlan[reg].write("\n\n######### Writing import for VLANs #########\n\n")
                     # check resources in vlan state
                     state_vlan = {'path': f'{outdir}/{reg}/{service_dir_vlan}', 'resources': []}
                     try:

cd3_automation_toolkit/Network/LoadBalancers/export_lbr_nonGreenField.py

@@ -477,6 +477,9 @@ def print_backendset_backendserver(region, ct, values_for_column_bss, lbr, LBRs,
                 values_for_column_bss['Cookie Path'].append("")
                 values_for_column_bss['Disable Fallback(TRUE|FALSE)'].append("")
 
+            # Get Health Checker
+            hc = lbr.get_health_checker(eachlbr.__getattribute__('id'), backendsets).data
+
             for col_headers in values_for_column_bss:
                 headers_lower = commonTools.check_column_headers(col_headers)
 
@@ -503,8 +506,6 @@ def print_backendset_backendserver(region, ct, values_for_column_bss, lbr, LBRs,
 
                 # Process the Backend Set and Backend Server  Columns
                 elif col_headers in sheet_dict_bss.keys():
-                    hc = lbr.get_health_checker(eachlbr.__getattribute__('id'), backendsets).data
-
                     if col_headers == "Backend Policy(LEAST_CONNECTIONS|ROUND_ROBIN|IP_HASH)":
                         policy = backendset_details.__getattribute__(sheet_dict_bss[col_headers])
                         values_for_column_bss['Backend Policy(LEAST_CONNECTIONS|ROUND_ROBIN|IP_HASH)'].append(
@@ -871,41 +872,48 @@ def print_routing_policies(region, ct, values_for_column_rp, LBRs, lbr_compartme
         comp_done_ids = []
         for comp_name, comp_id in ct.ntk_compartment_ids.items():
             if lbr_comp_id == comp_id and lbr_comp_id not in comp_done_ids:
-                # Retrieve the values for the routing policies
-                for rp, values in eachlbr.__getattribute__('routing_policies').items():
-                    for col_headers in values_for_column_rp.keys():
-                        headers_lower = commonTools.check_column_headers(col_headers)
-
-                        if col_headers in sheet_dict_common.keys():
-                            values_for_column_rp = common_headers(region, col_headers, values_for_column_rp, eachlbr,
-                                                                  sheet_dict_common, lbr_compartment_name)
-                        elif col_headers == 'LBR Name':
-                            values_for_column_rp[col_headers].append(eachlbr.display_name)
-
-                        elif col_headers == 'Routing Policy Name':
-                            values_for_column_rp[col_headers].append(values.__getattribute__('name'))
-
-                        elif col_headers == "Rules":
-                            rules = []
-                            for rule in values.rules:
-                                if hasattr(rule, 'actions') and rule.actions and hasattr(rule.actions[0], 'backend_set_name'):
-                                    backend_set_name = rule.actions[0].backend_set_name
-                                else:
-                                    backend_set_name = None
-                                rule_str = f"{rule.name}::{rule.condition}::{backend_set_name}"
-                                rules.append(rule_str)
-                            rules_string = "\n".join(rules)
-                            values_for_column_rp[col_headers].append(rules_string)
+                lbr_compartment_name = comp_name
+                comp_done_ids.append(lbr_comp_id)
 
-                        elif col_headers in sheet_dict_rp.keys():
-                            values_for_column_rp[col_headers].append(
-                                values.__getattribute__(sheet_dict_rp[col_headers]))
+        # Retrieve the values for the routing policies
+        for rp, values in eachlbr.__getattribute__('routing_policies').items():
+            for col_headers in values_for_column_rp.keys():
+                headers_lower = commonTools.check_column_headers(col_headers)
 
+                if col_headers in sheet_dict_common.keys():
+                    values_for_column_rp = common_headers(region, col_headers, values_for_column_rp, eachlbr,
+                                                          sheet_dict_common, lbr_compartment_name)
+                elif col_headers == 'LBR Name':
+                    values_for_column_rp[col_headers].append(eachlbr.display_name)
+
+                elif col_headers == 'Routing Policy Name':
+                    values_for_column_rp[col_headers].append(values.__getattribute__('name'))
+
+                elif col_headers == "Rules":
+                    rules = []
+                    for rule in values.rules:
+                        if hasattr(rule, 'actions') and rule.actions and hasattr(rule.actions[0], 'backend_set_name'):
+                            backend_set_name = rule.actions[0].backend_set_name
                         else:
-                            # Process the remaining  Columns
-                            oci_objs = [eachlbr, values]
-                            values_for_column_rp = commonTools.export_extra_columns(oci_objs, col_headers,
-                                                                                    sheet_dict_rp,
+                            backend_set_name = None
+
+                        name = rule.name.strip("\n")
+                        condition = rule.condition.strip("\n")
+                        backend_set_name = backend_set_name.strip("\n")
+                        rule_str = f"{name}::{condition}::{backend_set_name}"
+                        rules.append(rule_str)
+                    rules_string = "\n".join(rules)
+                    values_for_column_rp[col_headers].append(rules_string)
+
+                elif col_headers in sheet_dict_rp.keys():
+                    values_for_column_rp[col_headers].append(
+                        values.__getattribute__(sheet_dict_rp[col_headers]))
+
+                else:
+                    # Process the remaining  Columns
+                    oci_objs = [eachlbr, values]
+                    values_for_column_rp = commonTools.export_extra_columns(oci_objs, col_headers,
+                                                                            sheet_dict_rp,
                                                                                     values_for_column_rp)
 
     return values_for_column_rp
@@ -968,7 +976,7 @@ def export_lbr(inputfile, outdir, service_dir, config1, signer1, ct, export_comp
     print("\nFetching details of Load Balancer...")
 
     # Create backups
-    file_name = 'import_commands_lbr_nonGF.sh'
+    file_name = 'import_commands_lbr.sh'
     resource = 'import_lbr'
     total_resources=0
 

cd3_automation_toolkit/Release-Notes

@@ -2,11 +2,10 @@
 CD3 Automation Toolkit Tag v2024.4.1
 Sep 30th, 2024
 -------------------------------------
-1. Terraform modules in its own GIT Repo - https://github.com/oracle-devrel/cd3-automation-toolkit
-2. Call CD3 Validator for services while invoking create workflow for that service.
-3. Multi Prefix Support using Jenkins. Toolkit can be setup for multiple prefixes by specifying different values in tenancyconfig.properties.
-4. OCI RM Stack enhancements - disable legacy IMDS endpoints, enable in transit encryption, enable bastion plugin, specify custom boot volume size.
-5. Bug fixes - skip cross tenancy RPC, KMS fix, identity domain users/groups terraform modules, fetch compatible image OCIDs during createTenancyConfig.py
+1. Call CD3 Validator for services while invoking create workflow for that service.
+2. Multi Prefix Support using Jenkins. Toolkit can be setup for multiple prefixes by specifying different values in tenancyconfig.properties.
+3. OCI RM Stack enhancements - disable legacy IMDS endpoints, enable in transit encryption, enable bastion plugin, specify custom boot volume size.
+4. Bug fixes - skip cross tenancy RPC, KMS fix, identity domain users/groups terraform modules, fetch compatible image OCIDs during createTenancyConfig.py
 
 -------------------------------------
 CD3 Automation Toolkit Tag v2024.4.0