Automation Toolkit Release v10.1

Author: bhlohumi

cd3_automation_toolkit/Governance/Tagging/create_terraform_tags.py

@@ -116,9 +116,9 @@ def create_terraform_tags(inputfile, outdir, service_dir, prefix, config):
             if (regions[j] not in check_diff_region and regions[j] not in commonTools.endNames and str(regions[j]).lower() != "nan"):
                 check_diff_region.append(regions[j])
 
-        # If some invalid region is specified in a row which is not part of VCN Info Tab
-        if region not in ct.all_regions:
-            print("\nERROR!!! Invalid Region; It should be one of the regions tenancy is subscribed to..Exiting!")
+        # If some invalid region is specified in a row
+        if region != ct.home_region:
+            print("\nERROR!!! Invalid Region; It should be Home Region of the tenancy..Exiting!")
             exit(1)
 
         if str(df.loc[i,'Default Tag Compartment=Default Tag Value']).strip().lower() != 'nan' and str(df.loc[i,'Tag Keys']).strip().lower() == 'nan':

cd3_automation_toolkit/Identity/Compartments/create_terraform_compartments.py

@@ -109,7 +109,7 @@ def travel(parent, keys, values, c):
 
         region = region.strip().lower()
 
-        # If some invalid region is specified in a row which is not part of VCN Info Tab
+        # If some invalid region is specified in a row
         if region != ct.home_region:
             print("\nERROR!!! Invalid Region; It should be Home Region of the tenancy..Exiting!")
             exit(1)

cd3_automation_toolkit/Identity/Groups/create_terraform_groups.py

@@ -76,7 +76,7 @@ def create_terraform_groups(inputfile, outdir, service_dir, prefix, config=DEFAU
             break
         region=region.strip().lower()
 
-        # If some invalid region is specified in a row which is not part of VCN Info Tab
+        # If some invalid region is specified in a row
         if region != ct.home_region:
             print("\nERROR!!! Invalid Region; It should be Home Region of the tenancy..Exiting!")
             exit(1)

cd3_automation_toolkit/ManagementServices/Monitoring/export_alarms_nonGreenField.py

@@ -20,7 +20,7 @@
 oci_obj_names = {}
 
 
-def print_alarms(region, alarm, ncpclient,values_for_column, ntk_compartment_name):
+def print_alarms(region, alarm, ncpclient,values_for_column, ntk_compartment_name,ct):
     alarm_tf_name = commonTools.check_tf_variable(alarm.display_name)
     comp_tf_name = commonTools.check_tf_variable(ntk_compartment_name)
     suppression = alarm.suppression
@@ -34,7 +34,6 @@ def print_alarms(region, alarm, ncpclient,values_for_column, ntk_compartment_nam
     #    statistic = query[query.rfind(".") + 1:query.rfind("(")]
 
     skip_row=0
-    ct = commonTools()
     for col_header in values_for_column:
         if col_header == 'Region':
             values_for_column[col_header].append(region)
@@ -149,7 +148,7 @@ def export_alarms(inputfile, _outdir, service_dir, _config, ct, export_compartme
 
             for alarmSummary in alarms.data:
                 alarm=mclient.get_alarm(alarmSummary.id).data
-                print_alarms(region, alarm,ncpclient,values_for_column, ntk_compartment_name)
+                print_alarms(region, alarm,ncpclient,values_for_column, ntk_compartment_name,ct)
 
 
         with open(script_file, 'a') as importCommands[reg]:

cd3_automation_toolkit/Release-Notes

@@ -356,6 +356,6 @@ CD3 Automation Toolkit Tag v10.1
 4. Added Functionality for export of ADBs.
 5. Python code re do for creation of NSGs - Supports duplicate NSG names across different regions.
 6. Terraform code update to make Null values as optional in tfvars for all components.
-7. Performance tuning has been done wrt Fetch Compartments during Non-Greenfield workflow.The script will be exceuted
+7. Performance tuning has been done wrt Fetch Compartments during Non-Greenfield workflow. The script will be executed
    only once when you select multiple export options simultaneously.
 8. Bug fixes wrt Networking, Tagging, Excel sheet templates etc

cd3_automation_toolkit/Storage/BlockVolume/export_blockvolumes_nonGreenField.py

@@ -48,8 +48,6 @@ def volume_attachment_info(compute,ct,volume_id,export_compartments):
     attachments=None
     for ntk_compartment_name in export_compartments:
         attach_info = compute.list_volume_attachments(compartment_id = ct.ntk_compartment_ids[ntk_compartment_name], volume_id = volume_id)
-        print(attach_info.data)
-        print("-----------")
         for attachments in attach_info.data:
             lifecycle_state = attachments.lifecycle_state
             if lifecycle_state == 'ATTACHED':