Merge pull request #62 from oracle-devrel/develop

Automation Toolkit Release v11.1

Author: xs2suruchi

README.md

@@ -8,7 +8,7 @@
 
   <li> <a href= "#introduction">Introduction</a></li>
 
-  <li> <a href = "https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v11">What's new in this release</a></li>
+  <li> <a href = "https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v11.1">What's new in this release</a></li>
   <li> <a href = "/cd3_automation_toolkit/documentation/user_guide/learn_more/CD3ExcelTabs.md">Toolkit Supported OCI Services</a></li>
   <li> <a href = "/cd3_automation_toolkit/documentation/user_guide/RunningAutomationToolkit.md#excel-sheet-templates">Excel Templates</a></li>
 
@@ -29,14 +29,15 @@
   <li> <a href="/cd3_automation_toolkit/documentation/user_guide/GreenField.md">Green Field Tenancies</a>
     <ul>
       <li> <a href="/cd3_automation_toolkit/documentation/user_guide/NetworkingScenariosGF.md"</a><b> Must Read :</b> Managing Network for Greenfield Tenancies</li>
-      <li> <a href="/cd3_automation_toolkit/documentation/user_guide/RemoteExecution.md"</a><b> Must Read :</b> Remote Execution/Cloud Init for OCI compute instances</li>
+      <li> <a href="/cd3_automation_toolkit/documentation/user_guide/ComputeGF.md"</a><b> Must Read :</b> Managing Compute Instances for Greefield Tenancies</li>
     </ul>
     </ul>
   </li>
   <ul>
   <li> <a href="/cd3_automation_toolkit/documentation/user_guide/NonGreenField.md">Non Greenfield Tenancies</a>
     <ul>
       <li><a href ="/cd3_automation_toolkit/documentation/user_guide/NetworkingScenariosNGF.md"</a><b> Must Read : </b> Managing Network for Non-Greenfield Tenancies</li>
+       <li><a href = "/cd3_automation_toolkit/documentation/user_guide/ComputeNGF.md"</a><b>  Must Read : </b> Managing Compute Instances for Non-Greenfield Tenancies </li> 
     </ul>
   </ul>
 

cd3_automation_toolkit/Compute/create_terraform_dedicatedhosts.py

@@ -10,7 +10,6 @@
 #
 
 import sys
-import argparse
 import os
 from oci.config import DEFAULT_LOCATION
 from pathlib import Path
@@ -23,18 +22,9 @@
 ######
 # Required Inputs-CD3 excel file, Config file, prefix AND outdir
 ######
-def parse_args():
-    # Read input arguments
-    parser = argparse.ArgumentParser(description='Create Dedicated VM Hosts terraform file')
-    parser.add_argument('inputfile', help='Full Path of input CD3 excel file')
-    parser.add_argument('outdir', help='Output directory for creation of TF files')
-    parser.add_argument("service_dir",help="subdirectory under region directory in case of separate out directory structure")
-    parser.add_argument('prefix', help='TF files prefix')
-    parser.add_argument('--config', default=DEFAULT_LOCATION, help='Config file name')
-    return parser.parse_args()
-
 
 # If input is CD3 excel file
+# Execution of the code begins here
 def create_terraform_dedicatedhosts(inputfile, outdir, service_dir,prefix, config):
     # Load the template file
     file_loader = FileSystemLoader(f'{Path(__file__).parent}/templates')
@@ -153,10 +143,3 @@ def create_terraform_dedicatedhosts(inputfile, outdir, service_dir,prefix, confi
             print(outfile + " for dedicated vm hosts has been created for region  " + reg)
             oname.write(tfStr[reg])
             oname.close()
-
-
-
-if __name__ == '__main__':
-    args = parse_args()
-    # Execution of the code begins here
-    create_terraform_dedicatedhosts(args.inputfile, args.outdir, args.service_dir,args.prefix, args.config)

cd3_automation_toolkit/Compute/create_terraform_instances.py

@@ -10,7 +10,6 @@
 #
 
 import sys
-import argparse
 import os
 from oci.config import DEFAULT_LOCATION
 from pathlib import Path
@@ -20,18 +19,8 @@
 from jinja2 import Environment, FileSystemLoader
 
 
-def parse_args():
-    parser = argparse.ArgumentParser(description='Creates Instances TF file')
-    parser.add_argument('inputfile', help='Full Path of input CD3 excel file')
-    parser.add_argument('outdir', help='Output directory for creation of TF files')
-    parser.add_argument("service_dir",
-                        help="subdirectory under region directory in case of separate out directory structure")
-    parser.add_argument('prefix', help='TF files prefix')
-    parser.add_argument('--config', default=DEFAULT_LOCATION, help='Config file name')
-    return parser.parse_args()
-
-
 # If input is CD3 excel file
+# Execution of the code begins here
 def create_terraform_instances(inputfile, outdir, service_dir, prefix, config):
     boot_policy_tfStr = {}
     tfStr = {}
@@ -244,8 +233,3 @@ def create_terraform_instances(inputfile, outdir, service_dir, prefix, config):
             oname.write(tfStr[reg])
             oname.close()
 
-
-if __name__ == '__main__':
-    args = parse_args()
-    # Execution of the code begins here
-    create_terraform_instances(args.inputfile, args.outdir, args.service_dir, args.prefix, args.config)

cd3_automation_toolkit/Compute/export_dedicatedvmhosts_nonGreenField.py

@@ -8,7 +8,6 @@
 # Oracle Consulting
 #
 
-import argparse
 import oci
 import os
 
@@ -44,20 +43,7 @@ def print_dedicatedvmhosts(region, dedicatedvmhost, values_for_column, ntk_compa
             oci_objs = [dedicatedvmhost]
             values_for_column = commonTools.export_extra_columns(oci_objs, col_header, sheet_dict, values_for_column)
 
-
-def parse_args():
-    # Read the arguments
-    parser = argparse.ArgumentParser(description="Export Block Volumes on OCI to CD3")
-    parser.add_argument("inputfile", help="path of CD3 excel file to export Block Volume objects to")
-    parser.add_argument("outdir", help="path to out directory containing script for TF import commands")
-    parser.add_argument("service_dir",help="subdirectory under region directory in case of separate out directory structure")
-    parser.add_argument("--config", default=DEFAULT_LOCATION, help="Config file name")
-    parser.add_argument("--export-compartments", nargs='*', required=False, help="comma seperated Compartments for which to export Block Volume Objects")
-    parser.add_argument("--export-regions", nargs='*', help="comma seperated Regions for which to export Networking Objects",
-                        required=False)
-    return parser.parse_args()
-
-
+# Execution of the code begins here
 def export_dedicatedvmhosts(inputfile, _outdir, service_dir, _config, ct, export_compartments=[], export_regions=[]):
     global tf_import_cmd
     global sheet_dict
@@ -125,9 +111,3 @@ def export_dedicatedvmhosts(inputfile, _outdir, service_dir, _config, ct, export
     commonTools.write_to_cd3(values_for_column, cd3file, "DedicatedVMHosts")
 
     print("Dedicated VM Hosts exported to CD3\n")
-
-
-if __name__ == '__main__':
-    args = parse_args()
-    # Execution of the code begins here
-    export_dedicatedvmhosts(args.inputfile, args.outdir, args.service_dir,args.config, args.export_compartments, args.export_regions)

cd3_automation_toolkit/Compute/export_instances_nonGreenField.py

@@ -4,7 +4,6 @@
 # Oracle Consulting.
 
 import re
-import argparse
 import sys
 import oci
 import os
@@ -249,20 +248,7 @@ def __get_instances_info(compartment_name, compartment_id, reg_name, config,disp
                                       ins_shape, key_name, compartment_name, bkp_policy_name, nsg_names, dedicated_host,
                                       ins, values_for_column_instances, bdet, cpcn,shape_config, vnic_info, vnic_defined_tags, vnic_freeform_tags, launch_options)
 
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="Export Instances in OCI to CD3")
-    parser.add_argument("inputfile", help="path of CD3 excel file to export Instance objects to")
-    parser.add_argument("outdir", help="path to out directory containing script for TF import commands")
-    parser.add_argument("service_dir",help="subdirectory under region directory in case of separate out directory structure")
-    parser.add_argument("--config", default=DEFAULT_LOCATION, help="Config file name")
-    parser.add_argument("--export-compartments", nargs='*', required=False, help="comma seperated Compartments for which to export Instance Objects")
-    parser.add_argument("--export-regions", nargs='*', help="comma seperated Regions for which to export Networking Objects",
-                   required=False)
-
-    return parser.parse_args()
-
-
+# Execution of the code begins here
 def export_instances(inputfile, outdir, service_dir,config,ct, export_compartments=[], export_regions=[],display_names=[],ad_names=[]):
     cd3file = inputfile
 
@@ -373,8 +359,3 @@ def export_instances(inputfile, outdir, service_dir,config,ct, export_compartmen
     commonTools.write_to_cd3(values_for_column_instances, cd3file, "Instances")
     print("{0} Instance Details exported into CD3.\n".format(len(values_for_column_instances["Region"])))
 
-
-if __name__ == '__main__':
-    # Execution of the code begins here
-    args = parse_args()
-    export_instances(args.inputfile, args.outdir, args.service_dir,args.config, args.export_compartments, args.export_regions)

cd3_automation_toolkit/Database/create_terraform_adb.py

@@ -1,16 +1,13 @@
 #!/usr/bin/python3
 # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 #
-# This script will produce a Terraform file that will be used to set up OCI core components
-# Groups
+# This script will produce a Terraform file that will be used to set up OCI Database
+# Autonomous Database
 #
 # Author: Kartikey Rajput
 # Oracle Consulting
 # Modified (TF Upgrade): Divya Das
 #
-
-import sys
-import argparse
 import os
 from jinja2 import Environment, FileSystemLoader
 from oci.config import DEFAULT_LOCATION
@@ -21,18 +18,7 @@
 ######
 # Required Inputs- CD3 excel file, Config file, prefix AND outdir
 ######
-def parse_args():
-    # Read the arguments
-    parser = argparse.ArgumentParser(description="Create ADB terraform file")
-    parser.add_argument("inputfile", help="Full Path of input file. It could be CD3 excel file")
-    parser.add_argument("outdir", help="directory path for output tf files ")
-    parser.add_argument("service_dir", help="subdirectory under region directory in case of separate out directory structure")
-    parser.add_argument("prefix", help="customer name/prefix for all file names")
-    parser.add_argument("--config", default=DEFAULT_LOCATION, help="Config file name")
-    return parser.parse_args()
-
-
-#If input is cd3 file
+# Execution of the code begins here
 def create_terraform_adb(inputfile, outdir, service_dir, prefix, config=DEFAULT_LOCATION):
 
     filename = inputfile
@@ -221,8 +207,3 @@ def create_terraform_adb(inputfile, outdir, service_dir, prefix, config=DEFAULT_
             oname[reg].write(tfStr[reg])
             oname[reg].close()
             print(outfile[reg] + " containing TF for ADB has been created for region "+reg)
-                        
-if __name__ == '__main__':
-    # Execution of the code begins here
-    args = parse_args()
-    create_terraform_adb(args.inputfile, args.outdir, args.service_dir, args.prefix, args.config)

cd3_automation_toolkit/Database/create_terraform_dbsystems_vm_bm.py

@@ -1,15 +1,14 @@
 #!/usr/bin/python3
 # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 #
-# This script will produce a Terraform file that will be used to set up OCI core components
+# This script will produce a Terraform file that will be used to set up OCI Database
 # Database System Virtual Machine
 #
 # Author: Suruchi
 # Oracle Consulting
 #
 
 import sys
-import argparse
 import os
 from jinja2 import Environment, FileSystemLoader
 from oci.config import DEFAULT_LOCATION
@@ -20,18 +19,7 @@
 ######
 # Required Inputs- CD3 excel file, Config file, prefix AND outdir
 ######
-def parse_args():
-    # Read the arguments
-    parser = argparse.ArgumentParser(description="Create DB VM and DB BM terraform file")
-    parser.add_argument('inputfile', help='Full Path of input CD3 excel file')
-    parser.add_argument("outdir", help="directory path for output tf files ")
-    parser.add_argument("service_dir", help="subdirectory under region directory in case of separate out directory structure")
-    parser.add_argument('prefix', help='TF files prefix')
-    parser.add_argument('--config', default=DEFAULT_LOCATION, help='Config file name')
-    return parser.parse_args()
-
-
-#If input is cd3 file
+# Execution of the code begins here
 def create_terraform_dbsystems_vm_bm(inputfile, outdir, service_dir, prefix, config=DEFAULT_LOCATION):
     filename = inputfile
     configFileName = config
@@ -260,8 +248,3 @@ def create_terraform_dbsystems_vm_bm(inputfile, outdir, service_dir, prefix, con
             oname[reg].close()
             print(outfile[reg] + " for DBSystems-VM-BM has been created for region "+reg)
 
-
-if __name__ == '__main__':
-    args = parse_args()
-    # Execution of the code begins here
-    create_terraform_dbsystems_vm_bm(args.inputfile, args.outdir, args.service_dir, args.prefix, args.config)

cd3_automation_toolkit/Database/create_terraform_exa_infra.py

@@ -1,15 +1,13 @@
 #!/usr/bin/python3
 # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 #
-# This script will produce a Terraform file that will be used to set up OCI core components
+# This script will produce a Terraform file that will be used to set up OCI Database
 # Database EXA
 #
 # Author: Suruchi
 # Oracle Consulting
 #
 
-import sys
-import argparse
 import os
 from jinja2 import Environment, FileSystemLoader
 from oci.config import DEFAULT_LOCATION
@@ -20,18 +18,7 @@
 ######
 # Required Inputs- CD3 excel file, Config file, prefix AND outdir
 ######
-def parse_args():
-    # Read the arguments
-    parser = argparse.ArgumentParser(description="Create EXA Infra terraform file")
-    parser.add_argument('inputfile', help='Full Path of input CD3 excel file')
-    parser.add_argument("outdir", help="directory path for output tf files ")
-    parser.add_argument("service_dir", help="subdirectory under region directory in case of separate out directory structure")
-    parser.add_argument('prefix', help='TF files prefix')
-    parser.add_argument('--config', default=DEFAULT_LOCATION, help='Config file name')
-    return parser.parse_args()
-
-
-#If input is cd3 file
+# Execution of the code begins here
 def create_terraform_exa_infra(inputfile, outdir, service_dir, prefix, config=DEFAULT_LOCATION):
     filename = inputfile
     configFileName = config
@@ -166,8 +153,3 @@ def create_terraform_exa_infra(inputfile, outdir, service_dir, prefix, config=DE
             oname[reg].write(tfStr[reg])
             oname[reg].close()
             print(outfile[reg] + " for EXA-Infra has been created for region "+reg)
-
-if __name__ == '__main__':
-    args = parse_args()
-    # Execution of the code begins here
-    create_terraform_exa_infra(args.inputfile, args.outdir, args.service_dir, args.prefix, args.config)

cd3_automation_toolkit/Database/create_terraform_exa_vmclusters.py

@@ -1,16 +1,13 @@
 #!/usr/bin/python3
 # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 #
-# This script will produce a Terraform file that will be used to set up OCI core components
+# This script will produce a Terraform file that will be used to set up OCI Database
 # Database EXA
 #
 # Author: Kartikey Rajput
 # Oracle Consulting
 # Modified (TF Upgrade): Kartikey Rajput
 #
-
-import sys
-import argparse
 import os
 from jinja2 import Environment, FileSystemLoader
 from oci.config import DEFAULT_LOCATION
@@ -21,19 +18,7 @@
 ######
 # Required Inputs- CD3 excel file, Config file, prefix AND outdir
 ######
-def parse_args():
-    # Read the arguments
-    parser = argparse.ArgumentParser(description="Create EXA Home terraform file")
-    parser.add_argument('inputfile', help='Full Path of input CD3 excel file')
-    parser.add_argument('outdir', help='Output directory for creation of TF files')
-    parser.add_argument("service_dir", help="subdirectory under region directory in case of separate out directory structure")
-    parser.add_argument('prefix', help='TF files prefix')
-    parser.add_argument('--config', default=DEFAULT_LOCATION, help='Config file name')
-
-    return parser.parse_args()
-
-
-# If input is cd3 file
+# Execution of the code begins here
 def create_terraform_exa_vmclusters(inputfile, outdir, service_dir, prefix, config=DEFAULT_LOCATION):
     filename = inputfile
     configFileName = config
@@ -250,9 +235,3 @@ def create_terraform_exa_vmclusters(inputfile, outdir, service_dir, prefix, conf
             oname[reg].write(tfStr[reg])
             oname[reg].close()
             print(outfile[reg] + " for EXA-VMClusters has been created for region " + reg)
-
-
-if __name__ == '__main__':
-    args = parse_args()
-    # Execution of the code begins here
-    create_terraform_exa_vmclusters(args.inputfile, args.outdir, args.service_dir, args.prefix, args.config)