Merge pull request #33 from oracle-devrel/develop

Develop

Author: xs2suruchi

cd3_automation_toolkit/documentation/user_guide/NetworkingScenariosGF.md

@@ -65,6 +65,7 @@ In some scenarios, a DRG has already been created in the tenancy and rest of the
 
    Continue executing the remaining steps (from Step 6) of [Create Network](#1-create-network).
 
+<br>[Go back to Networking Scenarios](#greenfield-tenancies)
 ### Modify Network 
 Modifying the Networking components using Automation Toolkit involves three simple steps.
  - Add/modify the details of networking components like the VCNs, Subnets, DHCP and DRG in Excel Sheet.
@@ -93,6 +94,7 @@ _Steps in detail_:
 
 This completes the modification of Networking components in OCI. Verify the components in console.
 
+<br>[Go back to Networking Scenarios](#greenfield-tenancies)
 ### Modify Security Rules, Route Rules and DRG Route Rules
 
 Follow the below steps to add, update or delete the following components:
@@ -123,9 +125,9 @@ Follow the below steps to add, update or delete the following components:
        <br>_terraform plan_
        <br>_terraform apply_
 
-   This completes the modification of Security Rules, Route Rules and DRG Route Rules in OCI. Verify the components in console.
-
+   This completes the modification of Security Rules, Route Rules and DRG Route Rules in OCI. Verify the components in console.<br>
 
+<br>[Go back to Networking Scenarios](#greenfield-tenancies)
 ### Sync manual changes done in OCI of Security Rules, Route Rules and DRG Route Rules with CD3 Excel Sheet and Terraform
 Follow the below process to export the rules to the same CD3 Excel Sheet as the one used to Create Network, and to sync the Terraform files with OCI whenever an user adds, modifies or deletes rules in OCI Console manually.
 
@@ -162,7 +164,7 @@ Follow the below process to export the rules to the same CD3 Excel Sheet as the
 
    This completes the export of Security Rules, Route Rules and DRG Route Rules from OCI. Terraform plan/apply should be in sync with OCI.
 
-
+<br>[Go back to Networking Scenarios](#greenfield-tenancies)
 ### Add/Modify/Delete NSGs
 Follow the below steps to update NSGs.
 
@@ -185,7 +187,7 @@ Follow the below steps to update NSGs.
 
 This completes the modification of NSGs in OCI. Verify the components in console.
 
-
+<br>[Go back to Networking Scenarios](#greenfield-tenancies)
 <br><br>
 <div align='center'>
 

cd3_automation_toolkit/documentation/user_guide/NetworkingScenariosNGF.md

@@ -1,10 +1,14 @@
 # Networking Scenarios
 
 ## Non-Greenfield Tenancies
+- [Export Network](#non-greenfield-tenancies)
+- [Add a new or modify the existing networking components](#add-a-new-or-modify-the-existing-networking-components)
+
+
 **NOTE-**
 Before you start with Network Export, make sure you have run 'Fetch Compartments OCIDs to variables file'.
 
-### 1. Export Network
+### Export Network
 
 Follow the below steps to export the Networking components that includes VCNs, Subnets, DHCP, DRG, Security List, Route Tables, DRG Route Tables, NSGs, etc to CD3 Excel Sheet and create the Terraform state.
 
@@ -42,11 +46,12 @@ VCNs tab:
 Subnets tab:
 ![image](https://user-images.githubusercontent.com/115973871/214372535-69714cbc-1980-4dd5-ae52-e20441903d8a.png)
 
-### 2. Add a new or modify the existing networking components
+<br>[Go back to Networking Scenarios](#non-greenfield-tenancies)
+### Add a new or modify the existing networking components
 1. Export the Networking components by following the steps [above](#1-export-network). (Note that here _non\_gf\_tenancy_ flag is set to true)
 2. Follow the [process](/cd3_automation_toolkit/documentation/user_guide/NetworkingScenariosGF.md#modify-network) to add new components such as VCN/DHCP/DRG/IGW/NGW/SGW/LPG/Subnet etc. (Note that here _non\_gf\_tenancy_ flag is set to false)
 
-   
+<br>[Go back to Networking Scenarios](#non-greenfield-tenancies)
 
 
 <br><br>

cd3_automation_toolkit/documentation/user_guide/learn_more/SupportforAdditionalAttributes.md

@@ -15,11 +15,12 @@
 
 <img src =https://user-images.githubusercontent.com/115973871/215402830-d7856e2d-0bd9-43b9-94bd-df039a90b942.png width=50% height=50%>
 
-<li>Uncomment the parameter in **instances.tf** file as shown below.</li>
+
+Uncomment the parameter in **instances.tf** file as shown below.
 
 <img src =https://user-images.githubusercontent.com/115973871/215402973-72857dbd-5efd-40d9-8a7f-3541eb85af66.png width=50% height=50%>
 
-<li>Uncomment the parameter in **cd3_automation_toolkit\Compute\templates\instance-template** . Any line that is between {# <and> #} are commented in Jinja templates. From the screenshot below we note that the condition for **preserve_boot_volume**  is within the Jinja comments. Copy the highlighted line and place it after/outside line 184 (**#}**) as per below screenshot.</li>
+Uncomment the parameter in **cd3_automation_toolkit\Compute\templates\instance-template** . Any line that is between {# <and> #} are commented in Jinja templates. From the screenshot below we note that the condition for **preserve_boot_volume**  is within the Jinja comments. Copy the highlighted line and place it after/outside line 184 (**#}**) as per below screenshot.
 
 **Before**
 
@@ -29,7 +30,9 @@
 
 <img src =https://user-images.githubusercontent.com/115973871/215403345-fa24edf5-73d5-4417-ae71-9df216ec95bb.png width=50% height=50%>
 
-<li>Apart from the above changes, optionally, update the **instance_ssh_keys** and **instance_source_ocids** in your variables file before executing the toolkit to generate the auto.tfvars for instances.</li>
+
+Apart from the above changes, optionally, update the **instance_ssh_keys** and **instance_source_ocids** in your variables file before executing the toolkit to generate the auto.tfvars for instances.
+
 
 
 **Exemple 2 : To Add Freeform Tags**

cd3_automation_toolkit/documentation/user_guide/learn_more/Tabs.md

@@ -145,6 +145,8 @@ Output files generated:
 
 ## Export and Modify Rules
 
+You can export existing security rules and route rules in OCI. On choosing "Network" in the SetUpOCI menu and "Export existing secrules and RouteRules to CD3" and "Export existing DRG Routerules to CD3" submenu will allow to export existing security and route rules.
+