Automation Toolkit Release v2024.4.2

Author: xs2suruchi

cd3_automation_toolkit/user-scripts/createTenancyConfig.py

@@ -170,7 +170,7 @@ def update_devops_config(prefix, repo_ssh_url,files_in_repo,dir_values,devops_us
         os.mkdir(jenkins_home)
     git_config_file = jenkins_home + '/git_config'
 
-    #if git_config_file exists
+    # if /cd3user/tenancies/jenkins_home/git_config file exists
     if os.path.exists(git_config_file):
         f = open(git_config_file,"r")
         config_file_data = f.read()

othertools/oci-fsdr/commonLib.py

@@ -1,12 +1,16 @@
 import re
 import json
+from oci import regions
 
-def get_region_from_ocid(ocid, region_map):
-    match = re.search(r'oc1\.(.*?)\.', ocid)
+def get_region_from_ocid(ocid, region_map={}):
+    region_value = 'unknown-region'
+    match = re.search(r'oc\d{1,2}.(.*?)\.', ocid)
     if match:
         region_code = match.group(1)
-        return region_map.get(region_code, 'unknown-region')
-    return 'unknown-region'
+        if region_code:
+            # region_code = "phx"/"us-chicago-1"
+            region_value = regions.get_region_from_short_name(region_code)
+    return region_value
 
 def load_region_map(region_file):
     with open(region_file, 'r') as f:

othertools/oci-fsdr/export_drplan.py

@@ -17,9 +17,10 @@
 args = parser.parse_args()
 
 try:
-    region_file = os.path.dirname(os.path.abspath(__file__))+"/region_file.json"
-    region_map = load_region_map(region_file)
-    region = get_region_from_ocid(args.ocid, region_map)
+    #region_file = os.path.dirname(os.path.abspath(__file__))+"/region_file.json"
+    #region_map = load_region_map(region_file)
+    #region = get_region_from_ocid(args.ocid, region_map)
+    region = get_region_from_ocid(args.ocid)
 except Exception as e:
     print(f"Error loading region map: {str(e)}")
     exit(1)

othertools/oci-fsdr/update_drplan.py

@@ -15,9 +15,10 @@
 args = parser.parse_args()
 
 try:
-    region_file = os.path.dirname(os.path.abspath(__file__)) + "/region_file.json"
+    """region_file = os.path.dirname(os.path.abspath(__file__)) + "/region_file.json"
     region_map = load_region_map(region_file)
-    region = get_region_from_ocid(args.ocid, region_map)
+    region = get_region_from_ocid(args.ocid, region_map)"""
+    region = get_region_from_ocid(args.ocid)
 except Exception as e:
     print(f"Error loading region map or determining region from OCID: {str(e)}")
     print(".....Exiting!!!")