Merge pull request #111 from oracle-devrel/develop-temp

Develop temp

Author: xs2suruchi

README.md

@@ -30,8 +30,8 @@ Additionally, the toolkit also supports seamless resource management using OCI D
 
   <tr>
     <td>IAM/Identity</td>
-    <td>Governance</td>
-    <td>Policy Enforcement using OPA</td>
+    <td>Tagging</td>
+    <td>Quotas</td>
   </tr>
   <tr>
     <td>Network</td>
@@ -40,21 +40,30 @@ Additionally, the toolkit also supports seamless resource management using OCI D
   </tr>
   <tr>
     <td>OCI Network Firewall</td>
-    <td>SDDCs</td>
-    <td>CIS Landing Zone<br>Compliance</td>
+    <td>KMS</td>
+    <td>Policy Enforcement using OPA</td>
+    
   </tr>
   <tr>
     <td>Compute</td>
     <td>Storage</td>
     <td>Database</td>    
   </tr>
   <tr>
-    <td>Developer Services</td>
-    <td>Logging Services</td>
-    <td>Observability and Management</td>
+    <td>OKE</td>
+    <td>Resource Manager</td>
+    <td>SDDCs</td>    
   </tr>
   <tr>
-  
+    <td>Logging Services</td>
+    <td>Monitoring</td>
+    <td>Budgets</td>
+  </tr>
+  <tr>    
+    <td>Cloud Guard</td>
+    <td>SHOWOCI report</td>    
+    <td>CIS Landing Zone<br>Compliance</td>
+    
   </tr>
 </table>
 </tr>

cd3_automation_toolkit/DeveloperServices/ResourceManager/create_resource_manager_stack.py

@@ -150,6 +150,10 @@ def create_resource_manager(outdir,var_file, outdir_struct,prefix,auth_mechanism
             try:
                 with open(region_dir + '/variables_' + region + '.tf') as origfile, open(rm_dir + '/variables_' + region + '.tf', 'w') as newfile:
                     for line in origfile:
+                        if 'gateway_route_table = optional(bool,false)' in line:
+                            line = line.replace('gateway_route_table = optional(bool,false)','gateway_route_table = optional(bool)')
+                        if 'default_route_table = optional(bool,false)' in line:
+                            line = line.replace('default_route_table = optional(bool,false)','default_route_table = optional(bool)')
                         if "user_ocid" in line or "fingerprint" in line or "private_key_path" in line:
                             skipline = True
                         if not skipline:
@@ -181,6 +185,12 @@ def create_resource_manager(outdir,var_file, outdir_struct,prefix,auth_mechanism
                 try:
                     with open(region_dir+'/'+service_dir+'/variables_' + region + '.tf') as origfile, open(rm_dir + '/'+ service_dir +'/variables_' + region + '.tf','w') as newfile:
                         for line in origfile:
+                            if 'gateway_route_table = optional(bool,false)' in line:
+                                line = line.replace('gateway_route_table = optional(bool,false)',
+                                                    'gateway_route_table = optional(bool)')
+                            if 'default_route_table = optional(bool,false)' in line:
+                                line = line.replace('default_route_table = optional(bool,false)',
+                                                    'default_route_table = optional(bool)')
                             if "user_ocid"  in line or "fingerprint"  in line or "private_key_path" in line:
                                 skipline = True
                             if not skipline:

cd3_automation_toolkit/Identity/Users/export_users_nonGreenField.py

@@ -169,7 +169,7 @@ def export_users(inputfile, outdir, service_dir, config, signer, ct):
                         values_for_column_users[col_header].append("")
 
     commonTools.write_to_cd3(values_for_column_users, cd3file, sheetName_users)
-    print("{0} Users exported into CD3.\n".format(len(values_for_column_groups["Region"])))
+    print("{0} Users exported into CD3.\n".format(len(values_for_column_users["Region"])))
 
     with open(script_file, 'a') as importCommands[ct.home_region]:
         importCommands[ct.home_region].write('\n\nterraform plan\n')

cd3_automation_toolkit/Storage/FileSystem/export_fss_nonGreenField.py

@@ -337,7 +337,7 @@ def __get_mount_info(cname, ntk_compartment_ids, compartment_id, reg, availabili
                         mnt_p_ip = v['ip']
                         mnt_p_hostname = v['hostname']
                         nsg_names = v['nsg']
-                        add_column_data(reg, cname, AD_name, mt_display_name, vplussubnet, mnt_p_ip, mnt_p_hostname, "","", "", "", "", "", "","", "", "", "", "", "","", "", "", fsinfo=None, values_for_column_fss=values_for_column_fss, mnt_info1=None, nsg_n=nsg_names)
+                        add_column_data(reg, cname, AD_name, mt_display_name, vplussubnet, mnt_p_ip, mnt_p_hostname, "","", "", "", "", "", "","", "", "", "", "", "","", "", "", fsinfo=file_system_info_1, values_for_column_fss=values_for_column_fss, mnt_info1=None, nsg_n=nsg_names)
 
     except Exception as e:
         pass

cd3_automation_toolkit/cd3Validator.py

@@ -1946,7 +1946,7 @@ def validate_cd3(choices, filename, var_file, prefix, outdir, ct1): #config1, si
             val_net=True
 
             log("\n============================= Verifying VCNs Tab ==========================================\n")
-            log("\n====================== Note: LPGs will npt be verified ====================================\n")
+            log("\n====================== Note: LPGs will not be verified ====================================\n")
             print("\nProcessing VCNs Tab..")
             print("NOTE: LPGs will not be verified")
             vcn_check, vcn_cidr_check, vcn_peer_check = validate_vcns(filename, ct.ntk_compartment_ids, vcnobj) #, config)