Merge pull request #39 from oracle-devrel/develop

Automation Toolkit Release v10.1

Author: xs2suruchi

cd3_automation_toolkit/Compute/create_terraform_instances.py

@@ -240,4 +240,4 @@ def create_terraform_instances(inputfile, outdir, service_dir,prefix, config):
 if __name__ == '__main__':
     args = parse_args()
     # Execution of the code begins here
-    create_terraform_instances(args.inputfile, args.outdir, args.prefix, args.config)
+    create_terraform_instances(args.inputfile, args.outdir, args.service_dir, args.prefix, args.config)

cd3_automation_toolkit/Governance/Tagging/export_tags_nonGreenField.py

@@ -226,4 +226,5 @@ def export_tags_nongreenfield(inputfile, outdir, service_dir, _config, export_co
 
 if __name__=="__main__":
     args = parse_args()
-    export_tags_nongreenfield(args.inputfile, args.outdir, args.service_dir, args.config, args.export_compartments)
+    ct = None
+    export_tags_nongreenfield(args.inputfile, args.outdir, args.service_dir, args.config, args.export_compartments, ct)

cd3_automation_toolkit/ManagementServices/Logging/enable_terraform_logging.py

@@ -340,4 +340,4 @@ def enable_load_balancer_logging(filename, outdir, service_dir, prefix, config=D
 if __name__ == '__main__':
     # Execution of the code begins here
     args = parse_args()
-    enable_cis_oss_logging(args.outdir, args.service_dir, args.service_dir_iam,args.prefix, args.config, args.service_dir, args.region_name, args.comp_name)
+    enable_cis_oss_logging(args.outdir, args.service_dir, args.service_dir_iam,args.prefix, args.config, args.region_name, args.comp_name)

cd3_automation_toolkit/Network/BaseNetwork/exportNSG.py

@@ -266,4 +266,5 @@ def export_nsg(inputfile, export_compartments, export_regions, service_dir, _con
 
 if __name__=="__main__":
     args = parse_args()
-    export_nsg(args.inputfile, args.export_compartments, args.config, args.tf_import_cmd, args.outdir,args.regions,args.service_dir)
+    ct = None
+    export_nsg(args.inputfile, args.export_compartments, args.config, args.tf_import_cmd, args.outdir,args.regions,args.service_dir, ct)

cd3_automation_toolkit/Network/BaseNetwork/exportRoutetable.py

@@ -337,6 +337,7 @@ def export_routetable(inputfile, export_compartments,export_regions, service_dir
 
 if __name__=="__main__":
     args = parse_args()
-    export_routetable(args.inputfile, args.export_compartments, args.config, args.tf_import_cmd, args.outdir,args.export_regions,args.service_dir)
-    export_drg_routetable(args.inputfile, args.export_compartments, args.config, args.tf_import_cmd, args.outdir,args.export_regions,args.service_dir)
+    ct = None
+    export_routetable(args.inputfile, args.export_compartments, args.config, args.tf_import_cmd, args.outdir,args.export_regions,args.service_dir, ct)
+    export_drg_routetable(args.inputfile, args.export_compartments, args.config, args.tf_import_cmd, args.outdir,args.export_regions,args.service_dir, ct)
 

cd3_automation_toolkit/Network/BaseNetwork/exportSeclist.py

@@ -289,4 +289,5 @@ def export_seclist(inputfile, export_compartments,export_regions,service_dir, _c
 
 if __name__=="__main__":
     args = parse_args()
-    export_seclist(args.inputfile, args.export_compartments, args.config, args.tf_import_cmd, args.outdir,args.export_regions, args.service_dir)
+    ct = None
+    export_seclist(args.inputfile, args.export_compartments, args.config, args.tf_import_cmd, args.outdir,args.export_regions, args.service_dir, ct)

cd3_automation_toolkit/Network/LoadBalancers/export_lbr_nonGreenField.py

@@ -963,5 +963,6 @@ def parse_args():
 
 if __name__ == '__main__':
     args = parse_args()
+    ct = None
     # Execution of the code begins here
-    export_lbr(args.inputfile, args.outdir, args.service_dir, args.export_compartments, args.config,args.export_regions)
+    export_lbr(args.inputfile, args.outdir, args.service_dir, args.export_compartments, args.config,args.export_regions, ct)

cd3_automation_toolkit/Network/LoadBalancers/export_nlb_nonGreenField.py

@@ -353,5 +353,6 @@ def parse_args():
 
 if __name__ == '__main__':
     args = parse_args()
+    ct = None
     # Execution of the code begins here
-    export_nlb(args.inputfile, args.outdir, args.service_dir, args.export_compartments, args.config,args.export_regions)
+    export_nlb(args.inputfile, args.outdir, args.service_dir, args.export_compartments, args.config,args.export_regions, ct)