WMS ID 11169 - March 2024 update to GB instructions (oracle-livelabs#109

) * Added template files Copied from Valentin's Mongo API * Basic structure in place Basic structure in place * Fixed typos Fixed typos * Lab1 basic info Lab1 basic info * Changed img names Changed img names * Basic structure for all labs Basic structure for all labs * Update planned-maintenance.md * New structure from sample-workshop New structure from sample-workshop * Minor changes Minor changes * Fixed paths Fixed paths * Added tenancy folder Added tenancy folder * Added basic provisioning steps Added basic provisioning steps * Developing lab 3 Developing lab 3 * More on lab3 More on lab3 * Testing copy Testing copy * Update lab3-config.md * Lab 3 Tasks 1 to 3 Lab 3 Tasks 1 to 3 * small change * Simplified NSG rule Only one stateful ingress rule to open 6200 should be sufficient * Fixed typo in lab3 tacsrv * Lab 3 Task 4 * Lab 3 draft * Lab 4 tasks 1 to 2 * Finished lab 4 * Lab 5 Lab 5 * Fixing typos * Improved lab3 images * Fixing typos * Formatting code blocks * Trying better format * Adding steps to lab3 task 5 * Renamed first lab Replaced simple-ac with unplanned-outages * Removed unnecessary file * Improved instructions * Improved net config instructions * Better instructions * Restructuring labs * Starting lab1 * Stack apply instructions * Improved provisioning instructions * db unique name * Fixed lab 4 * Update lab4-planned-maintenance.md * Self QA modifs 1 Self QA modifs 1 * Self QA modifs 2 * Self QA modifs 3 * Self QA modifs 4 * Self QA modifs 5 * Self QA modifs 6 * Changing images names part 1 * Changing images names part 2 * Finished renaming images * Removed duplicate images Removed old images named with numbers and replaced with meaningful names * Added some COPY commands * Refreshed image edit-java-code * Updated the URL to download the stack * Improved common lab instructions For both BB & GB * Adding Green Button support Modified instructions for sandbox provisioning * Fixed shell prompts Fixed many shell prompts in command line examples * Fixing more typos * Clarifying sandbox instructions * Replacing DBCS with Oracle Base Database Replacing DBCS by Oracle Base Database and other clarifications * Fixed quarterly QA issues * GB no longer allows NSG Modified lab instructions for sandbox as it is now forbidden to create Network Security Groups * March 2024 Update Modified Green Button instructions to remove the need to create an NSG * Updated date of Last Update Updated date of Last Update --------- Co-authored-by: Andrei Manoliu <andrei.manoliu@oracle.com> Co-authored-by: Michelle Malcher <48925485+malcherm@users.noreply.github.com>
vltabacaru · Mar 27, 2024 · 1b8df99 · 1b8df99
1 parent 71b09db
commit 1b8df99
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 11 deletions.
diff --git a/ac-with-ucp/.vscode/settings.json b/ac-with-ucp/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
diff --git a/ac-with-ucp/introduction/introduction.md b/ac-with-ucp/introduction/introduction.md
@@ -57,4 +57,4 @@ Here is a video to help with the Oracle Trial Sign Up Process:
 ## Acknowledgements
 * **Author** - François Pons, Senior Principal Product Manager
 * **Contributors** - Andrei Manoliu, Principal Product Manager
-* **Last Updated By/Date** - François Pons, September 2022
+* **Last Updated By/Date** - François Pons, March 2024
diff --git a/ac-with-ucp/lab1-provision-env/lab1-provision-env.md b/ac-with-ucp/lab1-provision-env/lab1-provision-env.md
@@ -111,4 +111,4 @@ Click on the link below to download the Resource Manager zip files you need to b
 ## Acknowledgements
 * **Author** - François Pons, Senior Principal Product Manager
 * **Contributors** - Andrei Manoliu, Principal Product Manager
-* **Last Updated By/Date** - François Pons, September,15th 2022
+* **Last Updated By/Date** - François Pons, March 2024
diff --git a/ac-with-ucp/lab2-configure-env/lab2-configure-env.md b/ac-with-ucp/lab2-configure-env/lab2-configure-env.md
@@ -8,7 +8,7 @@ In this lab, we will customize the environment that will be used to run the rest
 
 There are three main elements in our environment:
 
-* **VCN-DEMORAC** : a **Virtual Cloud Network (VCN)** has been pre-created with the required network topology components inside the Oracle Cloud (Subnets, Route Tables, Security Lists, Gateways, etc.)
+* **VCN-DEMORAC** (or another automatically generated name if you run in a sandbox environment): a **Virtual Cloud Network (VCN)** has been pre-created with the required network topology components inside the Oracle Cloud (Subnets, Route Tables, Security Lists, Gateways, etc.)
 * **dbrac** : a two-node Database Cloud Service (aka Oracle Base RAC Database) **RAC database** with **Grid Infrastructure** (which should have also been pre-created)
 * **demotac** : a **Compute instance** Virtual Machine hosting our demo application
 
@@ -23,7 +23,7 @@ In this lab, you will:
 * Complete the network configuration
 </if>
 <if type="sandbox">
-* Review the network configuration
+* Understand important points in the network configuration
 </if>
 * Configure RAC database services
 * Create a demo schema in the database
@@ -45,14 +45,14 @@ This lab assumes you have:
 
 ## Task 1: Configure the Network for Oracle Net
 
+<if type="sandbox">
+***As you are running in a sandbox environment, you should skip this task and go directly to Task 2. Security restrictions in sandbox environments do not allow the creation of Network Security Groups. However, all required ports are open for the workshop to work. You can read the instructions in this task to better understand which ports need to be open and for which purpose.***
+</if>
+
   1. Create a **Network Security Group** rule allowing Oracle Net connectivity
 
     * It is necessary to **open TCP port 1521** in the VCN to allow the demo application to connect to the database. We can do this by configuring a **Network Security Group Rule** and adding the NSG to the database.
 
-    <if type="sandbox">
-    * *As you are running this workshop in a sandbox environment, the configuration of the Virtual Cloud Network, Network Security Group, and the association between the NSG and the database have been completed automatically. For a better understanding of what was done, follow the instructions in this task without actually creating these components. Changing them will result in errors throughout the workshop.*
-    </if>
-
     * From the Oracle Cloud web console, go to **Networking** and select your VCN. It should be named **VCN-DEMORAC**.
 
       ![OCI console menu vcn](https://oracle-livelabs.github.io/common/images/console/networking-vcn.png " ")
@@ -134,6 +134,14 @@ This lab assumes you have:
 
   1. Connect to Cloud shell from the details page of database **dbrac**
 
+    * From the Oracle Cloud web console, go to **Oracle Database**
+
+      ![OCI console menu database](https://oracle-livelabs.github.io/common/images/console/database-basedb.png " ")
+
+    * Select database **dbrac**
+
+      ![Select dbrac database](./images/task1/select-dbrac-database.png " ")
+
     * Click on the Cloud Shell icon from the top right of the OCI console
 
         ![Cloud Shell icon](./images/task2/cloud-shell-icon.png " ")
@@ -205,7 +213,7 @@ This lab assumes you have:
     * It is necessary to **open TCP port 6200** in the VCN to allow **Fast Application Notification Events** to flow from the cluster database to the client application. We can do this by adding a **Network Security Group Rule** to the database NSG.
 
     <if type="sandbox">
-    * *As you are running this workshop in a sandbox, this network configuration has already been done automatically, but you should still follow the instructions in this step to review and understand what was done without actually creating the rule to open port 6200.*
+    * *As you are running this workshop in a sandbox, you should skip this step. The port is open by an automatically created Security List. You can read the instructions in this step to review and understand what normally needs to be done manually to open port 6200.*
     </if>
 
     * From the OCI console under **Networking** > **Virtual Cloud Networks**, select the VCN (**VCN-DEMORAC**)
@@ -423,6 +431,16 @@ This lab assumes you have:
   1. Understand the demo application directory structure
 
 
+  <if type="sandbox">
+  * ***As you are running this workshop in a sandbox environment, you will have to change the connect strings in SQL and Java files.
+    **.dnsdemorac.vcndemorac** will have to be replaced by **.pub.ll12345vcn** where **12345** is your LiveLab reservation ID. (Note the two lower case **L** followed by reservation number.)
+    The following command may help you to make this change in all the files of the current folder and its subfolders:***
+    ````
+    <copy>grep -lir dnsdemorac.vcndemorac | xargs -i@ sed -i 's/dnsdemorac.vcndemorac/pub.ll12345vcn/g' @</copy>
+    ````
+  </if>
+
+
     * Using noVNC, connect to the remote desktop of the client machine **demotac** as user **oracle**.
 
         ![Remote Desktop](./images/task4/remote-desktop.png " ")
@@ -441,7 +459,9 @@ This lab assumes you have:
         ac/sql       : SQL scripts to be used in next labs
         ```
 
-
+    <if type="sandbox">
+    * As you are running this workshop in a sandbox environment, you should change the connect strings in SQL and Java files before running them. Replace ***.dnsdemorac.vcndemorac*** by ***.pub.ll12345vcn*** where ***12345*** is your LiveLab reservation ID.
+    </if>
 
   2. Open a terminal window (as oracle) and change directory to $HOME/work/ac/ddl
 
@@ -612,6 +632,18 @@ This lab assumes you have:
 
     * Verify the value of strScan and change it in MyCUPDemo.java if necessary.
 
+    <if type="sandbox">
+    * ***As you are running this workshop in a sandbox environment, you should change the connect string in the application code. Replace **.dnsdemorac.vcndemorac** by **.pub.ll12345vcn** where **12345** is your LiveLab reservation ID. Note the two lower case L.
+    For instance:***
+
+    ```
+    //String strScan = "ruby-scan.dnsdemorac.vcndemorac.oraclevcn.com";
+    String strScan = "ruby-scan.pub.ll12345vcn.oraclevcn.com";
+    //String strService = strAlias + ".dnsdemorac.vcndemorac.oraclevcn.com";
+    String strService = strAlias + ".pub.ll12345vcn.oraclevcn.com";
+    ```
+    </if>
+
 
   4. Compile the demo application
 
@@ -635,4 +667,4 @@ This lab assumes you have:
 ## Acknowledgements
 * **Author** - François Pons, Senior Principal Product Manager
 * **Contributors** - Andrei Manoliu, Principal Product Manager
-* **Last Updated By/Date** - François Pons, September, 15th 2022
+* **Last Updated By/Date** - François Pons, March 2024