Automation Toolkit Release v2024.2.2

Author: bhlohumi

cd3_automation_toolkit/Network/BaseNetwork/create_all_tf_objects.py

@@ -45,7 +45,7 @@ def create_all_tf_objects(inputfile, outdir, service_dir,prefix, ct, non_gf_tena
     # Create Workflow
     if non_gf_tenancy == False:
         with section('Process Subnets for Seclists creation'):
-            create_terraform_seclist(inputfile, outdir, service_dir_seclist, prefix, ct, modify_network)
+            create_terraform_seclist(inputfile, outdir, service_dir_network, prefix, ct, modify_network)
 
     with section('Process Subnets for Subnets creation'):
         create_terraform_subnet_vlan(inputfile, outdir, service_dir, prefix, ct, non_gf_tenancy, network_vlan_in_setupoci,modify_network)

cd3_automation_toolkit/Network/BaseNetwork/export_network_nonGreenField.py

@@ -1097,11 +1097,9 @@ def export_networking(inputfile, outdir, service_dir, config, signer, ct, export
     if len(service_dir) != 0:
         service_dir_network = service_dir['network']
         service_dir_nsg = service_dir['nsg']
-        service_dir_seclist = service_dir['seclist']
     else:
         service_dir_network = ""
         service_dir_nsg = ""
-        service_dir_seclist = ""
 
     # Fetch Major Objects
     export_major_objects(inputfile, outdir, service_dir_network, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions)
@@ -1113,7 +1111,7 @@ def export_networking(inputfile, outdir, service_dir, config, signer, ct, export
     export_subnets_vlans(inputfile, outdir, service_dir, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions)
 
     # Fetch RouteRules and SecRules
-    export_seclist(inputfile, outdir, service_dir_seclist, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions,_tf_import_cmd=True)
+    export_seclist(inputfile, outdir, service_dir_network, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions,_tf_import_cmd=True)
 
     export_routetable(inputfile, outdir, service_dir_network, config1=config, signer1=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions, _tf_import_cmd=True)
 

cd3_automation_toolkit/Release-Notes

@@ -1,13 +1,13 @@
 -------------------------------------
-CD3 Automation Toolkit Tag v2024.2.1
+CD3 Automation Toolkit Tag v2024.2.2
 Apr 30, 2024
 -------------------------------------
-1. Download latest Excel Sheet using Jenkins.
+1. Download excel sheet after create and export workflow using Jenkins.
 2. Docker Image upgrade to OL9 and upgrade of other softwares also.
 3. Dropdowns for Region and Compartment while running setUpOCI using Jenkins.
-4. Take out Security List from Network stack.
-5. Fix Image OCIDs for OCI Work VM deployment using RM stack.
-6. Review of existing terraform modules.
+4. Fix Image OCIDs for OCI Work VM deployment using RM stack.
+5. Option to execute 3rd Party Services from CD3 - Show OCI along with CIS Compliance Check script
+5. Upgrade of existing terraform modules - identity, buckets, LBaaS, NLBs,
 
 -------------------------------------
 CD3 Automation Toolkit Tag v2024.2.0

cd3_automation_toolkit/Security/Firewall/templates/policy-template

@@ -2,7 +2,7 @@
 
 #Input variables required to run setUpOCI script
 
-#path to output directory where terraform files will be generated. eg /cd3user/tenancies/<customer_name>/terraform_files
+#path to output directory where terraform files will be generated. eg. /cd3user/tenancies/<customer_name>/terraform_files
 outdir=
 
 #prefix for output terraform files eg <customer_name> like demo

cd3_automation_toolkit/example/CD3-Blank-template.xlsx

@@ -388,7 +388,7 @@ def export_network(prim_options=[]):
     # Update modified path list
     regions_path = export_regions.copy()
     regions_path.append("global")
-    service_dirs = [service_dir_network, service_dir_nsg, service_dir_vlan,'rpc']
+    service_dirs = [service_dir_network, service_dir_seclist, service_dir_nsg, service_dir_vlan,'rpc']
     update_path_list(regions_path=regions_path, service_dirs=service_dirs)
 
 def export_networking(inputfile, outdir,config, signer, ct, export_regions):
@@ -404,6 +404,7 @@ def export_networking(inputfile, outdir,config, signer, ct, export_regions):
 
     options = [
         Option(None, Network.create_terraform_dhcp_options, 'Processing DHCP Tab'),
+        Option(None, Network.modify_terraform_secrules, 'Processing SecRulesinOCI Tab'),
         Option(None, Network.modify_terraform_routerules, 'Processing RouteRulesinOCI Tab'),
         Option(None, Network.modify_terraform_drg_routerules, 'Processing DRGRouteRulesinOCI Tab'),
     ]
@@ -423,16 +424,9 @@ def export_networking(inputfile, outdir,config, signer, ct, export_regions):
 
     options = [ Option(None, Network.create_terraform_nsg, 'Processing NSGs Tab'), ]
     execute_options(options, inputfile, outdir, service_dir_nsg, prefix, ct)
-
-    options = [Option(None, Network.create_terraform_seclist, 'Processing SecRulesinOCI Tab'), ]
-    execute_options(options, inputfile, outdir, service_dir_seclist, prefix, ct, non_gf_tenancy)
-
-    print(
-        "\n\nExecute tf_import_commands_network_*_nonGF.sh script created under each region directory to synch TF with OCI Network objects\n")
-    for service in [service_dir_network, service_dir_vlan, service_dir_nsg, service_dir_seclist]:
-        if service not in service_dirs:
-            service_dirs.append(service)
-
+    print("\n\nExecute tf_import_commands_network_*_nonGF.sh script created under each region directory to synch TF with OCI Network objects\n")
+    for service in [service_dir_network,service_dir_vlan,service_dir_nsg]:
+        service_dirs.append(service_dir_network) if service_dir_network not in service_dirs else service_dirs
 
 def export_major_objects(inputfile, outdir, config, signer, ct, export_regions):
     compartments = ct.get_compartment_map(var_file,'VCN Major Objects')
@@ -466,11 +460,11 @@ def export_dhcp(inputfile, outdir,config,signer,ct,export_regions):
 
 def export_secrules(inputfile, outdir,config,signer,ct,export_regions):
     compartments = ct.get_compartment_map(var_file,'SecRulesInOCI')
-    Network.export_seclist(inputfile, outdir, service_dir_seclist, config, signer, ct, export_compartments=compartments, export_regions=export_regions, _tf_import_cmd=True)
+    Network.export_seclist(inputfile, outdir, service_dir_network, config, signer, ct, export_compartments=compartments, export_regions=export_regions, _tf_import_cmd=True)
     options = [
         Option(None, Network.modify_terraform_secrules, 'Processing SecRulesinOCI Tab'),
         ]
-    execute_options(options, inputfile, outdir,service_dir_seclist, prefix, ct, non_gf_tenancy)
+    execute_options(options, inputfile, outdir,service_dir_network, prefix, ct, non_gf_tenancy)
     print("\n\nExecute tf_import_commands_network_secrules_nonGF.sh script created under each region directory to synch TF with OCI Network objects\n")
 
 def export_routerules(inputfile, outdir,config,signer,ct,export_regions):
@@ -883,9 +877,9 @@ def export_modify_security_rules(inputfile, outdir, service_dir, prefix, ct, non
         options1 = []
         options1.append(option)
         if (option.name == 'Export Security Rules (From OCI into SecRulesinOCI sheet)'):
-            execute_options(options1, inputfile, outdir, service_dir_seclist, config, signer, ct, non_gf_tenancy=non_gf_tenancy)
+            execute_options(options1, inputfile, outdir, service_dir_network, config, signer, ct, non_gf_tenancy=non_gf_tenancy)
         elif (option.name == 'Add/Modify/Delete Security Rules (Reads SecRulesinOCI sheet)'):
-            execute_options(options1, inputfile, outdir, service_dir_seclist, prefix, ct, non_gf_tenancy)
+            execute_options(options1, inputfile, outdir, service_dir_network, prefix, ct, non_gf_tenancy)
 
 
 def export_security_rules(inputfile, outdir, service_dir, config, signer, ct, non_gf_tenancy):
@@ -1226,7 +1220,7 @@ def create_cis_features(prim_options=[]):
     execute_options(options, outdir, prefix, config_file_path)
 
 def run_utility(prim_options=[]):
-    options = [Option('CIS Compliance Checking Script', initiate_cis_scan, 'CIS Compliance Check Script'),
+    options = [Option('CIS Compliance Check Script', initiate_cis_scan, 'CIS Compliance Check Script'),
                Option('ShowOCI Report', run_showoci, 'ShowOCI Report')
     ]
     if prim_options:
@@ -1715,7 +1709,7 @@ def create_firewall(inputfile, outdir, service_dir, prefix, ct,sub_options=[]):
         Option('Software-Defined Data Centers - OCVS', create_sddc, 'Processing SDDC Tabs'),
         Option('CIS Compliance Features', create_cis_features, 'CIS Compliance Features'),
         Option('CD3 Services', cd3_services, 'CD3 Services'),
-        Option('Utility Services (Not Maintained By CD3)', run_utility,'Utility Services')
+        Option('3rd Party Services', run_utility,'3rd Party Services')
     ]
     export_regions = ct.all_regions