diff --git a/timesten/cache-introduction/00-novnc/images/novnc-desktop.png b/timesten/cache-introduction/00-novnc/images/novnc-desktop.png
deleted file mode 100644
index b952201ae..000000000
Binary files a/timesten/cache-introduction/00-novnc/images/novnc-desktop.png and /dev/null differ
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-launch-get-started-1.png b/timesten/cache-introduction/00-novnc/images/novnc-launch-get-started-1.png
deleted file mode 100644
index bcb06ebaf..000000000
Binary files a/timesten/cache-introduction/00-novnc/images/novnc-launch-get-started-1.png and /dev/null differ
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-launch-get-started-2.png b/timesten/cache-introduction/00-novnc/images/novnc-launch-get-started-2.png
deleted file mode 100644
index 26671319e..000000000
Binary files a/timesten/cache-introduction/00-novnc/images/novnc-launch-get-started-2.png and /dev/null differ
diff --git a/timesten/cache-introduction/00-novnc/novnc-livelabs.md b/timesten/cache-introduction/00-novnc/novnc-livelabs.md
deleted file mode 100644
index c1fa97fed..000000000
--- a/timesten/cache-introduction/00-novnc/novnc-livelabs.md
+++ /dev/null
@@ -1,125 +0,0 @@
-# Using noVNC Remote Desktop and enabling SSH access
-
-## Introduction
-
-This workshop can be accessed using a browser based graphical remote desktop (noVNC). It can also be accessed using SSH. This lab will show you how to get started with your workshop with a remote desktop session, and how to enable SSH access.
-
-**Estimated Lab Time**: 10 minutes
-
-### Objectives
-
-In this lab, you will:
-
-- Enable fullscreen display of remote desktop session
-- Enable remote clipboard integration
-- Open the workshop guide from the remote desktop
-- Enable SSH access (optional)
-
-### Prerequisites
-
-This lab assumes you have:
-
-- Launched the workshop in the LiveLabs environment
-- An RSA format SSH private/public key pair to use to access the OCI instance using SSH (optional)
-
-If you need help in generating a suitable SSH key pair, please consult [this tutorial](https://docs.oracle.com/en/learn/generate_ssh_keys/index.html).
-
-## Task 1: Enable Full-screen Display
-For seamless desktop integration and to make the best use of your display, perform the following tasks to render your remote desktop session in fullscreen mode.
-
-1. Click on the small gray tab on the middle-left side of your screen to open the control bar.
-
- 
-
-2. Select *Fullscreen* to render the session on your entire screen.
-
- 
- 
-
-## Task 2: Enable Copy/Paste from Local to Remote Desktop
-During the execution of your labs you may need to copy text from your local PC/Mac to the remote desktop, such as commands from the lab guide. While such direct copy/paste isn't supported as you will realize, you may proceed as indicated below to enable an alternative local-to-remote clipboard with Input Text Field.
-
-1. Continuing from the last task above, Select the *clipboard* icon
-
- 
-
-2. Copy some text from your local computer as illustrated below and paste into the clipboard widget, then finally open up the desired application (e.g. Terminal) and paste accordingly using *mouse controls*
-
- 
-
- *Note:* Please make sure you initialize your clipboard with step [1] shown in the screenshot above before opening the target application in which you intend to paste the text. Otherwise will find the *paste* function in the context menu grayed out when attempting to paste for the first time.
-
- **IMPORTANT:** Due to the slightly cumbesome nature of copying between your host system and the NoVNC session, we recommend that you perform all of the copy/paste actiosn within the NoVNC session. Alternatively, access the workshop's OCI instance via SSH and copy/paste between your host and your SSH session.
-
-## Task 3: Open Your Workshop Guide
-
-1. If the *Web* browser window is not already open, double-click on the *Get Started with your Workshop* icon from the remote desktop. This will open the workshop instructions within the NoVNC session (ideal for copy/paste).
-
- 
-
-2. On the left is the browser window with your workshop guide
-
- 
-
-
-## Task 4: Configure SSH access (optional).
-
-While your workshop can be executed end-to-end from the remote desktop, follow the steps provided below if you need to access the instance remotely using an SSH client such as Putty, Unix/Linux/MacOS Terminal, OCI cloudshell, and other terminal emulators available on Windows.
-
-*Notes:* In this section you are enabling SSH access to the OS user running the remote desktop, wich for this workshop is the **oracle** user.
-
-This assumes that you already have an RSA type SSH key-pair available on the local system where you will be connecting from. If you don't and for more info on creating and using SSH keys for your specific platform and client, please refer to the guide [Generate SSH Keys](https://docs.oracle.com/en/learn/generate_ssh_keys/index.html)
-
-1. Open the remote clipboard on the remote desktop as shown in *Task 2* and launch a terminal session
-
-2. Paste the block below onto the remote clipboard first, then onto the terminal to create or update the file *$HOME/.ssh/authorized_keys* with the *Vi* editor
-
- ```
-
- cd $HOME/.ssh
- vi authorized_keys
-
- ```
-
- 
-
-3. From the local system (e.g. your laptop) and with the exception of *Putty* users, locate the SSH public key from the key-pair, open it, and copy the entire content to the clipboard.
-
- 
-
- If using Putty you must load the private key (*.ppk*) into *Puttygen* utility to see the relevant public key block to copy. Do not copy the content of the public key file directly as it will not work.
-
- 
-
-4. Paste the copied public key onto the remote clipboard first, then onto the terminal where you opened *authorized_keys* for edit
-
- 
-
-5. Save and exit *vi* editor
-
-6. Set required permissions on *authorized_keys*
-
- ```
-
- chmod 0600 authorized_keys
-
- ```
-
-7. Test/Validate connectivity using the private key (for Unix/Linux/MacOS Terminal, OCI cloudshell, and Terminal emulators on Windows such as Cygwin and MobaXterm).
-
- ```
- ssh -i [path to private key] remote-user@[instance-public-ip-address]
- e.g.
-
- ssh -i /home/youruser/.ssh/livelabs_rsa oracle@150.136.123.105
-
- ```
-
- For Putty, please refer to the guide [Generate SSH Keys](https://oracle-livelabs.github.io/common/labs/generate-ssh-key) on how to establish the connection using the *.ppk* private key.
-
-You can now *proceed to the next lab*.
-
-## Acknowledgements
-* **Author** - Rene Fontcha, LiveLabs Platform Lead, NA Technology
-* **Contributors** - Arabella Yao, Database Product Management
-* **Last Updated By/Date** - Chris Jenkins, July 2022
\ No newline at end of file
diff --git a/timesten/cache-introduction/00-novnc/novnc-owntenancy.md b/timesten/cache-introduction/00-novnc/novnc-owntenancy.md
deleted file mode 100644
index 3514a0444..000000000
--- a/timesten/cache-introduction/00-novnc/novnc-owntenancy.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Using noVNC Remote Desktop and enabling SSH access
-
-## Introduction
-
-This workshop can be accessed using a browser based graphical remote desktop (noVNC). It can also be accessed using SSH. This lab will show you how to get started with your workshop with a remote desktop session.
-
-If you plan to only use SSH access then you can *proceed to the next lab*.
-
-**Estimated Lab Time**: 5 minutes
-
-### Objectives
-
-In this lab, you will:
-
-- Enable fullscreen display of remote desktop session
-- Enable remote clipboard integration
-- Open the workshop guide from the remote desktop
-
-### Prerequisites
-
-This lab assumes you have:
-
-- Launched the workshop in your own tenancy using via the provided ORM stack
-
-## Task 1: Enable Full-screen Display
-For seamless desktop integration and to make the best use of your display, perform the following tasks to render your remote desktop session in fullscreen mode.
-
-1. Click on the small gray tab on the middle-left side of your screen to open the control bar.
-
- 
-
-2. Select *Fullscreen* to render the session on your entire screen.
-
- 
- 
-
-## Task 2: Enable Copy/Paste from Local to Remote Desktop
-During the execution of your labs you may need to copy text from your local PC/Mac to the remote desktop, such as commands from the lab guide. While such direct copy/paste isn't supported as you will realize, you may proceed as indicated below to enable an alternative local-to-remote clipboard with Input Text Field.
-
-1. Continuing from the last task above, Select the *clipboard* icon
-
- 
-
-2. Copy some text from your local computer as illustrated below and paste into the clipboard widget, then finally open up the desired application (e.g. Terminal) and paste accordingly using *mouse controls*
-
- 
-
- *Note:* Please make sure you initialize your clipboard with step [1] shown in the screenshot above before opening the target application in which you intend to paste the text. Otherwise will find the *paste* function in the context menu grayed out when attempting to paste for the first time.
-
- **IMPORTANT:** Due to the slightly cumbesome nature of copying between your host system and the NoVNC session, we recommend that you perform all of the copy/paste actions within the NoVNC session rather than between your host and the NoVNC session.
-
-## Task 3: Open Your Workshop Guide
-
-1. If the *Web* browser window is not already open, double-click on the *Get Started with your Workshop* icon from the remote desktop. This will open the workshop instructions within the NoVNC session (ideal for copy/paste).
-
- 
-
-2. On the left is the browser window with your workshop guide
-
- 
-
-*You may now proceed to the next lab.*
-
-## Acknowledgements
-* **Author** - Rene Fontcha, LiveLabs Platform Lead, NA Technology
-* **Contributors** - Arabella Yao, Database Product Management
-* **Last Updated By/Date** - Chris Jenkins, August 2022
\ No newline at end of file
diff --git a/timesten/cache-introduction/00-setup-compute/setup-compute.md b/timesten/cache-introduction/00-setup-compute/setup-compute.md
index e67f07950..4be8a1c83 100644
--- a/timesten/cache-introduction/00-setup-compute/setup-compute.md
+++ b/timesten/cache-introduction/00-setup-compute/setup-compute.md
@@ -21,7 +21,7 @@ For more information about Terraform and Resource Manager, please see the append
This lab assumes you have:
- An Oracle Cloud account (paid or free trial)
-- You have completed *Lab: Prepare Setup*
+- Completed *Lab: Prepare Setup*
## Task 1: Create Stack: Choose a Path
@@ -91,26 +91,6 @@ In the prior steps we elected to trigger the *terraform apply action* on stack c
2. Congratulations, your environment has been created! Click on the *Application Information* tab to get additional information about what you have just done.
3. Your public IP address(es), instance name(s), and remote desktop URL are displayed.
-
-## Task 4: Access the Graphical Remote Desktop
-For ease of execution of this workshop, your VM instance has been pre-configured with a remote graphical desktop accessible using any modern browser on your laptop or workstation. Proceed as detailed below to login.
-
-1. Navigate to **Stack Details**, **Application Information** tab, and click on the remote desktop URL
-
- 
-
- 
-
- This should take you directly to your remote desktop in a single click.
-
- 
-
- *Note:* While rare, you may see an error on the browser - “*Deceptive Site Ahead*†or similar depending on your browser type as shown below.
-
- Public IP addresses used for LiveLabs provisioning comes from a pool of reusable addresses and this error is due to the fact that the address was previously used by a compute instance long terminated, but that wasn't properly secured, got bridged and was flagged. You can safely ignore and proceed by clicking on *Details*, and finally on *Visit this unsafe site*.
-
- 
-
You can now *proceed to the next lab*.
## Appendix 1: Terraform and Resource Manager
diff --git a/timesten/cache-introduction/00-verify-compute/images/create-stack-novnc-10.png b/timesten/cache-introduction/00-verify-compute/images/create-stack-novnc-10.png
new file mode 100644
index 000000000..433aa609b
Binary files /dev/null and b/timesten/cache-introduction/00-verify-compute/images/create-stack-novnc-10.png differ
diff --git a/timesten/cache-introduction/00-verify-compute/images/login-info.png b/timesten/cache-introduction/00-verify-compute/images/login-info.png
new file mode 100644
index 000000000..4254327db
Binary files /dev/null and b/timesten/cache-introduction/00-verify-compute/images/login-info.png differ
diff --git a/timesten/cache-introduction/00-verify-compute/images/my-reservation-completed.png b/timesten/cache-introduction/00-verify-compute/images/my-reservation-completed.png
new file mode 100644
index 000000000..11ff1f9bb
Binary files /dev/null and b/timesten/cache-introduction/00-verify-compute/images/my-reservation-completed.png differ
diff --git a/timesten/cache-introduction/00-verify-compute/images/my-reservations.png b/timesten/cache-introduction/00-verify-compute/images/my-reservations.png
new file mode 100644
index 000000000..7c8ff1026
Binary files /dev/null and b/timesten/cache-introduction/00-verify-compute/images/my-reservations.png differ
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-clipboard-1.png b/timesten/cache-introduction/00-verify-compute/images/novnc-clipboard-1.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-clipboard-1.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-clipboard-1.png
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-clipboard-2.png b/timesten/cache-introduction/00-verify-compute/images/novnc-clipboard-2.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-clipboard-2.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-clipboard-2.png
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-copy-pub-key-1.png b/timesten/cache-introduction/00-verify-compute/images/novnc-copy-pub-key-1.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-copy-pub-key-1.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-copy-pub-key-1.png
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-copy-pub-key-2.png b/timesten/cache-introduction/00-verify-compute/images/novnc-copy-pub-key-2.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-copy-pub-key-2.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-copy-pub-key-2.png
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-copy-pub-key-3.png b/timesten/cache-introduction/00-verify-compute/images/novnc-copy-pub-key-3.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-copy-pub-key-3.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-copy-pub-key-3.png
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-copy-pub-key-4.png b/timesten/cache-introduction/00-verify-compute/images/novnc-copy-pub-key-4.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-copy-pub-key-4.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-copy-pub-key-4.png
diff --git a/timesten/cache-introduction/00-verify-compute/images/novnc-deceptive-site-error.png b/timesten/cache-introduction/00-verify-compute/images/novnc-deceptive-site-error.png
new file mode 100644
index 000000000..41f31f3f4
Binary files /dev/null and b/timesten/cache-introduction/00-verify-compute/images/novnc-deceptive-site-error.png differ
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-fullscreen-1.png b/timesten/cache-introduction/00-verify-compute/images/novnc-fullscreen-1.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-fullscreen-1.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-fullscreen-1.png
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-fullscreen-2.png b/timesten/cache-introduction/00-verify-compute/images/novnc-fullscreen-2.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-fullscreen-2.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-fullscreen-2.png
diff --git a/timesten/cache-introduction/00-novnc/images/novnc-fullscreen-3.png b/timesten/cache-introduction/00-verify-compute/images/novnc-fullscreen-3.png
similarity index 100%
rename from timesten/cache-introduction/00-novnc/images/novnc-fullscreen-3.png
rename to timesten/cache-introduction/00-verify-compute/images/novnc-fullscreen-3.png
diff --git a/timesten/cache-introduction/00-verify-compute/images/novnc-launch-get-started-2.png b/timesten/cache-introduction/00-verify-compute/images/novnc-launch-get-started-2.png
new file mode 100644
index 000000000..1b3e8d99e
Binary files /dev/null and b/timesten/cache-introduction/00-verify-compute/images/novnc-launch-get-started-2.png differ
diff --git a/timesten/cache-introduction/00-verify-compute/images/novnc-login-1.png b/timesten/cache-introduction/00-verify-compute/images/novnc-login-1.png
new file mode 100644
index 000000000..4f2923f6a
Binary files /dev/null and b/timesten/cache-introduction/00-verify-compute/images/novnc-login-1.png differ
diff --git a/timesten/cache-introduction/00-verify-compute/verify-compute-desktop.md b/timesten/cache-introduction/00-verify-compute/verify-compute-desktop.md
new file mode 100644
index 000000000..a7c48852d
--- /dev/null
+++ b/timesten/cache-introduction/00-verify-compute/verify-compute-desktop.md
@@ -0,0 +1,126 @@
+# Connect to the workshop compute instance
+
+## Introduction
+This lab will show you how to login to your pre-created compute instance running on Oracle Cloud.
+
+**Estimated Lab Time:** 10 minutes
+
+### Objectives
+In this lab, you will:
+
+- Learn how to connect to your compute instance using the NoVNC Remote Desktop
+- Learn the basics of using the NoVNC Desktop, including copy and paste
+- Configure and use SSH access to the compute instance (optional)
+
+### Prerequisites
+
+This lab assumes:
+
+- You have successfully provisioned a workshop compute instance either in the LiveLabs sandbix or in your own tenancy
+- If you using the LiveLabs sandbox, and you wish to use SSH to access the compute instance, that you have an RSA format SSH private/public key pair to use to access the compute instance (optional)
+
+If you wish to use the NoVNC graphical desktop to access the workshop compute instance, please complete **tasks 1 and 2** below.
+
+If you prefer to use SSH to access the compute instance, please complete **task 3** below.
+
+If you wish to be able to use both connection methods, please complete all the tasks in this lab.
+
+**IMPORTANT:** Due to the slightly cumbersome nature of copying between your host system and the NoVNC session, we recommend that you perform all of the copy/paste actions within the NoVNC session itself, as this avoids the use of the NoVNC clipboard. Alternatively, access the workshop's compute instance via SSH and copy/paste between the lab instructions displayed in your local browser and your SSH session.
+
+## Task 1: Enable NoVNC Full-screen Display
+
+Too make the best use of your display, perform the following tasks to render your remote desktop session in fullscreen mode.
+
+1. Click on the small gray tab on the middle-left side of your screen to open the control bar.
+
+ 
+
+2. Select *Fullscreen* to render the session on your entire screen.
+
+ 
+ 
+
+## Task 2: Enable Copy/Paste from Local to Remote Desktop
+
+During the execution of this workshop you may will to copy text from your local PC/Mac to the remote desktop, such as commands from the lab guide. While such direct copy/paste isn't supported, you may proceed as indicated below to enable an alternative local-to-remote clipboard via the NoVNC Clipboard.
+
+1. Continuing from the last task above, Select the *clipboard* icon
+
+ 
+
+2. Copy some text from your local computer as illustrated below and paste into the clipboard widget, then finally open up the desired application (e.g. Terminal) and paste accordingly using *mouse controls*
+
+ 
+
+*Note:* Please make sure you initialize your clipboard with step [1] shown in the screenshot above before opening the target application in which you intend to paste the text. Otherwise will find the *paste* function in the context menu grayed out when attempting to paste for the first time.
+
+If you will be using the NoVNC desktop for the workshop, make sure that you have an open terminal session. If you have closed the terminal session that was open when you first logged in, open a new one now using **Activities > Terminal** from the Linux desktop menu bar.
+
+## Task 3: Configure and use SSH access (optional)
+
+While your workshop can be executed end-to-end from the remote desktop, follow the steps provided below if you prefer to access the instance remotely using an SSH client such as Putty, Unix/Linux/MacOS Terminal, OCI cloudshell, and other terminal emulators available on Windows.
+
+**IMPORTANT:** If you are running the workshop instance in your own tenancy and you configured SSH access as part of deploying the instance via the ORM stack, skip straight to step **7** below.
+
+*Note:* In this section you are enabling SSH access to the OS user running the remote desktop, which for this workshop is the **oracle** user.
+
+This assumes that you already have an RSA type SSH key-pair available on the local system where you will be connecting from. If you don't, then for more info on creating and using SSH keys for your specific platform and client, please refer to the guide [Generate SSH Keys](https://docs.oracle.com/en/learn/generate_ssh_keys/index.html)
+
+1. Open the remote clipboard on the remote desktop as shown in *Task 3* and launch a terminal session
+
+2. Paste the block below onto the remote clipboard first, then onto the terminal to create or update the file *$HOME/.ssh/authorized_keys* using the *vi* editor
+
+ ```
+
+ cd $HOME/.ssh
+ vi authorized_keys
+
+ ```
+
+ 
+
+ Enter append mode in vi (type **A**), and start a new line if required.
+
+3. From the local system (e.g. your laptop), with the exception of *Putty* users, locate the SSH _public_ key from your key-pair, open it, and copy the entire content to the clipboard.
+
+ 
+
+ If using *Putty* you must load the private key (*.ppk*) into *Puttygen* utility to see the relevant public key block to copy. Do not copy the content of the public key file directly as it will not work.
+
+ 
+
+4. Paste the copied public key into the remote clipboard first, then into the terminal where you opened the *authorized_keys* file for editing.
+
+ 
+
+5. Save and exit the *vi* editor (press the **Escape** key then type **ZZ**)
+
+6. Set the required permissions on *authorized_keys*
+
+ ```
+
+ chmod 0600 authorized_keys
+
+ ```
+
+7. Verify SSH connectivity using the private key (for Unix/Linux/MacOS Terminal, OCI cloudshell, and Terminal emulators on Windows such as Cygwin and MobaXterm).
+
+ ```
+ ssh -i [path to private key] remote-user@[instance-public-ip-address]
+ e.g.
+
+ ssh -i ~/.ssh/livelabs_rsa oracle@150.136.123.105
+
+ ```
+
+ For Putty, please refer to the guide [Generate SSH Keys](https://oracle-livelabs.github.io/common/labs/generate-ssh-key) on how to establish the connection using the *.ppk* private key.
+
+You should now have an open terminal session in the compute instance, either via the NoVNC desktop or via SSH. Keep this session open for the next lab.
+
+You may now *proceed to the next lab*.
+
+
+## Acknowledgements
+* **Author** - Rene Fontcha, LiveLabs Platform Lead, NA Technology
+* **Contributors** - LiveLabs Team
+* **Last Updated By/Date** - Chris Jenkins, August 2022
\ No newline at end of file
diff --git a/timesten/cache-introduction/00-verify-compute/verify-compute-freetier.md b/timesten/cache-introduction/00-verify-compute/verify-compute-freetier.md
new file mode 100644
index 000000000..025b3d3ee
--- /dev/null
+++ b/timesten/cache-introduction/00-verify-compute/verify-compute-freetier.md
@@ -0,0 +1,82 @@
+# Connect to the workshop compute instance using NoVNC Remote Desktop
+
+## Introduction
+This lab will show you how to login to your compute instance running on Oracle Cloud using the browser based NoVMC remote graphical desktop
+
+If you configured the workshop compute instance for SSH access when you deployed it, and you prefer to use SSH instead of the graphical remote desktop, then skip this lab and *proceed to the next lab*.
+
+**Estimated Lab Time:** 10 minutes
+
+### Objectives
+In this lab, you will:
+
+- Learn how to connect to your compute instance using the NoVNC Remote Desktop
+- Learn the basics of using the NoVNC Desktop, including copy and paste
+
+### Prerequisites
+
+This lab assumes:
+
+- You have successfully completed all the previous labs in this workshop, in sequence.
+
+## Task 1: Access the Graphical Remote Desktop
+For ease of execution of this workshop, your VM instance has been pre-configured with a remote graphical desktop accessible using any modern browser on your laptop or workstation. Proceed as detailed below to login.
+
+If you prefer to connect to the compute instance using SSH to execute the workshop steps and commands, please skip the rest of this lab and *proceed to the next lab*.
+
+1. Navigate to **Stack Details**, **Application Information** tab, and click on the remote desktop URL
+
+ 
+
+ 
+
+ This should take you directly to your remote desktop in a single click.
+
+ 
+
+**Note:** While rare, you _may_ see an error titled **Deceptive Site Ahead**, or similar, depending on your browser type, as shown below.
+
+
+
+Public IP addresses used for LiveLabs provisioning come from a pool of reusable addresses. This error is due to the fact that the address was previously used by a different compute instance, long terminated, which wasn't properly cleaned up.
+
+You can safely ignore this error. Proceed by clicking on **Details**, and finally on **visit this unsafe site**.
+
+## Task 2: Enable NoVNC Full-screen Display
+
+Too make the best use of your display, perform the following tasks to render your remote desktop session in fullscreen mode.
+
+1. Click on the small gray tab on the middle-left side of your screen to open the control bar.
+
+ 
+
+2. Select *Fullscreen* to render the session on your entire screen.
+
+ 
+ 
+
+## Task 3: Enable Copy/Paste from Local to Remote Desktop
+
+During the execution of this workshop you may will to copy text from your local PC/Mac to the remote desktop, such as commands from the lab guide. While such direct copy/paste isn't supported, you may proceed as indicated below to enable an alternative local-to-remote clipboard via the NoVNC Clipboard.
+
+1. Continuing from the last task above, Select the *clipboard* icon
+
+ 
+
+2. Copy some text from your local computer as illustrated below and paste into the clipboard widget, then finally open up the desired application (e.g. Terminal) and paste accordingly using *mouse controls*
+
+ 
+
+*Note:* Please make sure you initialize your clipboard with step [1] shown in the screenshot above before opening the target application in which you intend to paste the text. Otherwise will find the *paste* function in the context menu grayed out when attempting to paste for the first time.
+
+**IMPORTANT:** Due to the slightly cumbersome nature of copying between your host system and the NoVNC session, we recommend that you perform all of the copy/paste actions within the NoVNC session itself, as this avoids the use of the NoVNC clipboard. Alternatively, access the workshop's compute instance via SSH and copy/paste between the lab instructions displayed in your local browser and your SSH session.
+
+If you will be using the NoVNC desktop for the workshop, make sure that you have an open terminal session. If you have closed the terminal session that was open when you first logged in, open a new one now using **Activities > Terminal** from the Linux desktop menu bar.
+
+You may now *proceed to the next lab*.
+
+
+## Acknowledgements
+* **Author** - Rene Fontcha, LiveLabs Platform Lead, NA Technology
+* **Contributors** - LiveLabs Team
+* **Last Updated By/Date** - Chris Jenkins, August 2022
\ No newline at end of file
diff --git a/timesten/cache-introduction/00-verify-compute/verify-compute-livelabs.md b/timesten/cache-introduction/00-verify-compute/verify-compute-livelabs.md
new file mode 100644
index 000000000..23e794420
--- /dev/null
+++ b/timesten/cache-introduction/00-verify-compute/verify-compute-livelabs.md
@@ -0,0 +1,146 @@
+# Connect to the workshop compute instance
+
+## Introduction
+This lab will show you how to login to your pre-created compute instance running on Oracle Cloud.
+
+**Estimated Lab Time:** 10 minutes
+
+### Objectives
+In this lab, you will:
+
+- Learn how to connect to your compute instance using the NoVNC Remote Desktop
+- Learn the basics of using the NoVNC Desktop, including copy and paste
+- Configure and use SSH access to the compute instance (optional)
+
+### Prerequisites
+
+This lab assumes:
+
+- You have successfully submitted a reservation using the **Run on LiveLabs** option
+- Your reservation has been successfully provisioned and started and is ready to use
+- You have an RSA format SSH private/public key pair to use to access the compute instance via SSH (optional)
+
+## Task 1: Access the NoVNC Graphical Remote Desktop
+For ease of execution of this workshop, your VM instance has been pre-configured with a remote graphical desktop accessible using any modern browser on your laptop or workstation. Proceed as detailed below to login.
+
+1. Now that your instance has been provisioned, navigate to **My Reservations**, find the request you submitted from the list displayed (only one item will be displayed if this is your first request).
+
+ 
+
+2. Click on **Launch Workshop** after the reservation provisioning has been completed.
+
+ 
+
+3. Click on **View Login info** and then on **Launch Remote Desktop** link.
+
+ 
+
+ This should take you directly to your remote desktop in a single click.
+
+ 
+
+**Note:** While rare, you _may_ see an error titled **Deceptive Site Ahead**, or similar, depending on your browser type, as shown below.
+
+
+
+Public IP addresses used for LiveLabs provisioning come from a pool of reusable addresses. This error is due to the fact that the address was previously used by a different compute instance, long terminated, which wasn't properly cleaned up.
+
+You can safely ignore this error. Proceed by clicking on **Details**, and finally on **visit this unsafe site**.
+
+## Task 2: Enable NoVNC Full-screen Display
+
+Too make the best use of your display, perform the following tasks to render your remote desktop session in fullscreen mode.
+
+1. Click on the small gray tab on the middle-left side of your screen to open the control bar.
+
+ 
+
+2. Select *Fullscreen* to render the session on your entire screen.
+
+ 
+ 
+
+## Task 3: Enable Copy/Paste from Local to Remote Desktop
+
+During the execution of this workshop you may will to copy text from your local PC/Mac to the remote desktop, such as commands from the lab guide. While such direct copy/paste isn't supported, you may proceed as indicated below to enable an alternative local-to-remote clipboard via the NoVNC Clipboard.
+
+1. Continuing from the last task above, Select the *clipboard* icon
+
+ 
+
+2. Copy some text from your local computer as illustrated below and paste into the clipboard widget, then finally open up the desired application (e.g. Terminal) and paste accordingly using *mouse controls*
+
+ 
+
+*Note:* Please make sure you initialize your clipboard with step [1] shown in the screenshot above before opening the target application in which you intend to paste the text. Otherwise will find the *paste* function in the context menu grayed out when attempting to paste for the first time.
+
+**IMPORTANT:** Due to the slightly cumbersome nature of copying between your host system and the NoVNC session, we recommend that you perform all of the copy/paste actions within the NoVNC session itself, as this avoids the use of the NoVNC clipboard. Alternatively, access the workshop's compute instance via SSH and copy/paste between the lab instructions displayed in your local browser and your SSH session.
+
+If you will be using the NoVNC desktop for the workshop, make sure that you have an open terminal session. If you have closed the terminal session that was open when you first logged in, open a new one now using **Activities > Terminal** from the Linux desktop menu bar.
+
+## Task 4: Configure and use SSH access (optional)
+
+While your workshop can be executed end-to-end from the remote desktop, follow the steps provided below if you prefer to access the instance remotely using an SSH client such as Putty, Unix/Linux/MacOS Terminal, OCI cloudshell, and other terminal emulators available on Windows.
+
+*Note:* In this section you are enabling SSH access to the OS user running the remote desktop, which for this workshop is the **oracle** user.
+
+This assumes that you already have an RSA type SSH key-pair available on the local system where you will be connecting from. If you don't, then for more info on creating and using SSH keys for your specific platform and client, please refer to the guide [Generate SSH Keys](https://docs.oracle.com/en/learn/generate_ssh_keys/index.html)
+
+1. Open the remote clipboard on the remote desktop as shown in *Task 3* and launch a terminal session
+
+2. Paste the block below onto the remote clipboard first, then onto the terminal to create or update the file *$HOME/.ssh/authorized_keys* using the *vi* editor
+
+ ```
+
+ cd $HOME/.ssh
+ vi authorized_keys
+
+ ```
+
+ 
+
+ Enter append mode in vi (type **A**), and start a new line if required.
+
+3. From the local system (e.g. your laptop), with the exception of *Putty* users, locate the SSH _public_ key from your key-pair, open it, and copy the entire content to the clipboard.
+
+ 
+
+ If using *Putty* you must load the private key (*.ppk*) into *Puttygen* utility to see the relevant public key block to copy. Do not copy the content of the public key file directly as it will not work.
+
+ 
+
+4. Paste the copied public key into the remote clipboard first, then into the terminal where you opened the *authorized_keys* file for editing.
+
+ 
+
+5. Save and exit the *vi* editor (press the **Escape** key then type **ZZ**)
+
+6. Set the required permissions on *authorized_keys*
+
+ ```
+
+ chmod 0600 authorized_keys
+
+ ```
+
+7. Verify SSH connectivity using the private key (for Unix/Linux/MacOS Terminal, OCI cloudshell, and Terminal emulators on Windows such as Cygwin and MobaXterm).
+
+ ```
+ ssh -i [path to private key] remote-user@[instance-public-ip-address]
+ e.g.
+
+ ssh -i ~/.ssh/livelabs_rsa oracle@150.136.123.105
+
+ ```
+
+ For Putty, please refer to the guide [Generate SSH Keys](https://oracle-livelabs.github.io/common/labs/generate-ssh-key) on how to establish the connection using the *.ppk* private key.
+
+You should now have an open terminal session in the compute instance, either via the NoVNC desktop or via SSH. Keep this session open for the next lab.
+
+You may now *proceed to the next lab*.
+
+
+## Acknowledgements
+* **Author** - Rene Fontcha, LiveLabs Platform Lead, NA Technology
+* **Contributors** - LiveLabs Team
+* **Last Updated By/Date** - Chris Jenkins, August 2022
\ No newline at end of file
diff --git a/timesten/cache-introduction/01-introduction/introduction.md b/timesten/cache-introduction/01-introduction/introduction.md
index 3d49984b4..db64a3c6b 100644
--- a/timesten/cache-introduction/01-introduction/introduction.md
+++ b/timesten/cache-introduction/01-introduction/introduction.md
@@ -32,7 +32,7 @@ In this workshop you will:
* Run a simple OLTP benchmark to see the performance benefit of TimesTen
* Run some queries to see the speedup provided by TimesTen
* Use dynamic cache groups
-* Shutdown the TimesTen cache and instance
+* Shut down the TimesTen cache and instance
### Prerequisites
@@ -52,7 +52,10 @@ You can run this workshop:
This workshop does _not_ support the Oracle Cloud 'Always Free' tier due to that tier's resource restrictions.
-**IMPORTANT:** This workshop requires an OCI compute instance with at least **4 CPUs** and **32 GB RAM.** If you choose to run this workshop in your own tenancy, please ensure that you have sufficient resources available.
+**IMPORTANT:**
+
+1. This workshop requires an OCI compute instance with at least **4 CPUs** and **32 GB RAM.** If you choose to run this workshop in your own tenancy, please ensure that you have sufficient resources available.
+2. Depending on how you run the workshop (LiveLabs sandbox or your own tenancy), and whether you look at the workshop guide that loads in your own local browser or the one within the workshop compute instance, you may notice minor differences. This is because each guide is customized based on the context where it is being used. For the best experience, consistently follow either the guide within the workshop instance or the one in your local browser.
You can now *proceed to the next lab*.
diff --git a/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-desktop.md b/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-desktop.md
deleted file mode 100644
index 1c060242d..000000000
--- a/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-desktop.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Connect to the workshop compute instance
-
-## Introduction
-
-In this lab, you will learn the different ways to connect to the OCI compute instance that hosts the workshop.
-
-The workshop requires you to use a terminal session to run various commands and observe their output. Often you may need to copy and paste commands or text from the workshop instructions into the terminal session.
-
-In the LiveLabs sandbox, the only connection method available to you by default is a GUI session using the browser-based noVNC remote desktop mechanism. It is possible to set up SSH connectivity by adding your own SSH public key into the instance.
-
-If you wish to use the NoVNC remote desktop, we recommend that you perform all of your copy/paste activities completely within NoVNC.
-
-If you prefer, you can connect using SSH and copy/paste between the workshop instructions in your host's browser and your SSH session.
-
-**Estimated Lab Time:** 5 minutes
-
-### Objectives
-
-- Connect to the compute instance using noVNC remote desktop
-- Connect to the compute instance using SSH (optional)
-
-### Prerequisites
-
-This lab assumes that you have:
-
-- Completed all the previous labs in this workshop, in sequence.
-
-## Task 1: Connect using noVNC remote desktop
-
-When you launch the workshop by clicking the *Launch Workshop* link in the LiveLabs reservation page entry, these instructions open in your browser. Click on ***View Login Info*** at the tope left of the browser window and then click the Launch Remote Desktop button. You should then see the workshop desktop.
-
-
-
-You can use the **Terminal** option under the *Activities* menu, or double-click the *Terminal* icon on the desktop, to open a terminal session.
-
-## Task 2: Connect using SSH (optional)
-
-You can connect to the instance as the oracle user using an SSH private key.
-
-Follow the instructions in the lab *Using noVNC Remote Desktop* to add your SSH public key to the **oracle** user's SSH **authorized_keys** file. You can then connect to the workshop compute instance using the corresponding SSH private key.
-
-Assuming that the SSH private key is **~/.ssh/id_livelabs** and the public IP address of the workshop compute instance is **123.123.123.123** then you can connect using:
-
-```
-
-ssh -i ~/.ssh/id_livelabs oracle@123.123.123.123
-
-```
-
-```
-The authenticity of host '123.123.123.123 (123.123.123.123)' can't be established.
-ED25519 key fingerprint is SHA256:bm2wv3HgyBIhIRov6+EtId10rQHyq1LXpXglQMpqhqA.
-This key is not known by any other names
-Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
-Warning: Permanently added '140.238.69.118' (ED25519) to the list of known hosts.
-Last login: Mon Jun 27 09:12:52 2022 from aa.bb.cc.dd
-[oracle@ttlivelabvm ~]$
-```
-
-You can now *proceed to the next lab*.
-
-If you plan to use SSH then keep your terminal session open for use in the next lab.
-
-## Acknowledgements
-
-* **Author** - Chris Jenkins, Senior Director, TimesTen Product Management
-* **Contributors** - Doug Hood & Jenny Bloom, TimesTen Product Management
-* **Last Updated By/Date** - Chris Jenkins, August 2022
-
diff --git a/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-freetier.md b/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-freetier.md
index cd00cf8e8..c0b1cc96f 100644
--- a/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-freetier.md
+++ b/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-freetier.md
@@ -20,7 +20,7 @@ This lab assumes that you have:
## Task 1: Connect using SSH (optional)
-If you configured SSH access as part setting up the ORM stack then you can connect to the instance, as the oracle user, using an SSH private key.
+If you configured SSH access as part setting up the ORM stack then you can connect to the instance, as the **oracle** user, using an SSH private key.
If you selected an automatically generated SSH private key, the key can be viewed and copied on the Stack's Application Information tab:
@@ -28,9 +28,9 @@ If you selected an automatically generated SSH private key, the key can be viewe
Copy/paste the key into a file on your client computer, or import into your SSH client, and use it to connect via SSH.
-**NOTE:** On Linux and macOS systems, SSH private keys should be stored in your user's .ssh directory (**~/.ssh**) and must have permissions of **600 (rw-------)**.
+**NOTE:** On Linux and macOS systems, SSH private keys should be stored in your user's .ssh directory (**~/.ssh**) and must have permissions of **600 (-rw-------)**.
-Assuming that the SSH private key is **~/.ssh/id_livelabs** and the public IP address of the workshop compute instance is **123.123.123.123** then you can connect using:
+Assuming that the SSH private key is **~/.ssh/id_livelabs** and the public IP address of the workshop compute instance is **123.123.123.123** then you can connect, as the **oracle** user, using:
```
diff --git a/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-livelabs.md b/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-livelabs.md
deleted file mode 100644
index b506de994..000000000
--- a/timesten/cache-introduction/03-connect-to-instance/connect-to-instance-livelabs.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Connect to the workshop compute instance
-
-## Introduction
-
-In this lab, you will learn the different ways to connect to the OCI compute instance that hosts the workshop.
-
-The workshop requires you to use a terminal session to run various commands and observe their output. Often you may need to copy and paste commands or text from the workshop instructions into the terminal session.
-
-In the LiveLabs sandbox, the only connection method available to you by default is a GUI session using the browser-based noVNC remote desktop mechanism. It is possible to set up SSH connectivity by adding your own SSH public key into the instance.
-
-If you wish to use the NoVNC remote desktop, we recommend that you perform all of your copy/paste activities completely within NoVNC.
-
-If you prefer, you can connect using SSH and copy/paste between the workshop instructions in your host's browser and your SSH session.
-
-**Estimated Lab Time:** 5 minutes
-
-### Objectives
-
-- Connect to the compute instance using noVNC remote desktop
-- Connect to the compute instance using SSH (optional)
-
-### Prerequisites
-
-This lab assumes that you have:
-
-- Completed all the previous labs in this workshop, in sequence.
-
-## Task 1: Connect using noVNC remote desktop
-
-When you launch the workshop by clicking the *Launch Workshop* link in the LiveLabs reservation page entry, these instructions open in your browser. Click on ***View Login Info*** at the tope left of the browser window and then click the Launch Remote Desktop button. You should then see the workshop desktop.
-
-
-
-You can use the **Terminal** option under the *Activities* menu, or double-click the *Terminal* icon on the desktop, to open a terminal session.
-
-## Task 2: Connect using SSH (optional)
-
-You can connect to the instance as the oracle user using an SSH private key.
-
-Follow the instructions in the lab *Using noVNC Remote Desktop* to add your SSH public key to the **oracle** user's SSH **authorized_keys** file. You can then connect to the workshop compute instance using the corresponding SSH private key.
-
-Assuming that the corresponding SSH private key is **~/.ssh/id_livelabs** and the public IP address of the workshop compute instance is **123.123.123.123** then you can connect using:
-
-```
-
-ssh -i ~/.ssh/id_livelabs oracle@123.123.123.123
-
-```
-
-```
-The authenticity of host '123.123.123.123 (123.123.123.123)' can't be established.
-ED25519 key fingerprint is SHA256:bm2wv3HgyBIhIRov6+EtId10rQHyq1LXpXglQMpqhqA.
-This key is not known by any other names
-Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
-Warning: Permanently added '140.238.69.118' (ED25519) to the list of known hosts.
-Last login: Mon Jun 27 09:12:52 2022 from aa.bb.cc.dd
-[oracle@ttlivelabvm ~]$
-```
-
-You can now *proceed to the next lab*.
-
-If you plan to use SSH then keep your terminal session open for use in the next lab.
-
-## Acknowledgements
-
-* **Author** - Chris Jenkins, Senior Director, TimesTen Product Management
-* **Contributors** - Doug Hood & Jenny Bloom, TimesTen Product Management
-* **Last Updated By/Date** - Chris Jenkins, August 2022
-
diff --git a/timesten/cache-introduction/03-connect-to-instance/images/novnc-desktop.png b/timesten/cache-introduction/03-connect-to-instance/images/novnc-desktop.png
deleted file mode 100644
index b952201ae..000000000
Binary files a/timesten/cache-introduction/03-connect-to-instance/images/novnc-desktop.png and /dev/null differ
diff --git a/timesten/cache-introduction/03-connect-to-instance/images/orm-novnc-url.png b/timesten/cache-introduction/03-connect-to-instance/images/orm-novnc-url.png
deleted file mode 100644
index 54100174c..000000000
Binary files a/timesten/cache-introduction/03-connect-to-instance/images/orm-novnc-url.png and /dev/null differ
diff --git a/timesten/cache-introduction/03-connect-to-instance/images/workshop-homescreen.png b/timesten/cache-introduction/03-connect-to-instance/images/workshop-homescreen.png
deleted file mode 100644
index af0e2014c..000000000
Binary files a/timesten/cache-introduction/03-connect-to-instance/images/workshop-homescreen.png and /dev/null differ
diff --git a/timesten/cache-introduction/05-create-instance/create-instance.md b/timesten/cache-introduction/05-create-instance/create-instance.md
index 32a8f5016..aa7ba1975 100644
--- a/timesten/cache-introduction/05-create-instance/create-instance.md
+++ b/timesten/cache-introduction/05-create-instance/create-instance.md
@@ -4,7 +4,7 @@
In this lab, you will create a TimesTen instance to host our TimesTen cache database, start the instance and execute a few simple TimesTen commands.
-**Estimated Lab Time:** 5 minutes.
+**Estimated Lab Time:** 6 minutes.
### Objectives
@@ -52,7 +52,9 @@ drwxr-xr-x. 2 oracle oinstall 4096 May 26 13:10 scripts
## Task 2: Create a TimesTen instance
-A TimesTen _installation_ is comprised of the TimesTen software components. An installation is created by unzipping the TimesTen software distribution media into a suitable location. For this workshop, the TimesTen software distribution media has already been unzipped into the directory **/shared/sw** to create a TimesTen installation named **tt22.1.1.3.0**. Take a look at that:
+A TimesTen _installation_ is comprised of the TimesTen software components. An installation is created by unzipping the TimesTen software distribution media into a suitable location. For this workshop, the TimesTen software distribution media has already been unzipped into the directory **/shared/sw** to create a TimesTen installation named **tt22.1.1.3.0**. Take a look at that.
+
+1. List the top level software directory.
```
@@ -65,6 +67,8 @@ total 0
dr-xr-x---. 17 oracle oinstall 277 May 5 22:20 tt22.1.1.3.0
```
+2. List the contents of the TimesTen installation top level directory.
+
```
ls -l /shared/sw/tt22.1.1.3.0
@@ -96,7 +100,7 @@ You can create one or more TimesTen _instances_ from an installation. A TimesTen
When it is operational, a TimesTen instance also includes a set of associated processes which cooperate to manage the TimesTen databases that are owned by the instance.
-Create a TimesTen instance called **ttinst** by using the **ttInstanceCreate** command located in the installation’s **bin** directory:
+3. Create a TimesTen instance called **ttinst** by using the **ttInstanceCreate** command located in the installation’s **bin** directory:
```
@@ -123,7 +127,7 @@ Instance created successfully.
```
-Copy the predefined **sys.odbc.ini** configuration file (more on that later) to the instance:
+4. Copy the predefined **sys.odbc.ini** configuration file (more on that later) to the instance:
```
diff --git a/timesten/cache-introduction/06-prepare-oracle/prepare-oracle.md b/timesten/cache-introduction/06-prepare-oracle/prepare-oracle.md
index 877dd8399..ef2b33468 100644
--- a/timesten/cache-introduction/06-prepare-oracle/prepare-oracle.md
+++ b/timesten/cache-introduction/06-prepare-oracle/prepare-oracle.md
@@ -143,6 +143,8 @@ CREATE TABLESPACE cachetblsp DATAFILE '/opt/oracle/oradata/ORCLCDB/ORCLPDB1/ttca
Tablespace created.
```
+**NOTE:** This operation takes a few minutes.
+
3. Create the TimesTen cache admin user (in this workshop we will name the user **ttcacheadm** with password **ttcacheadm**):
```
diff --git a/timesten/cache-introduction/08-load-cache/load-cache.md b/timesten/cache-introduction/08-load-cache/load-cache.md
index 078f26664..969421478 100644
--- a/timesten/cache-introduction/08-load-cache/load-cache.md
+++ b/timesten/cache-introduction/08-load-cache/load-cache.md
@@ -4,7 +4,7 @@
In this lab, you will load data from the Oracle tables into the TimesTen cache tables. This action will also activate the AUTOREFRESH mechanism which will periodically refresh the cache with any changes that have occurred in the Oracle database.
-**Estimated Lab Time:** 5 minutes
+**Estimated Lab Time:** 6 minutes
### Objectives
@@ -82,6 +82,9 @@ Cache Group APPUSER.CG_VPN_USERS:
1 cache group found.
```
+Note that the status of autorefresh has now changed to **On**.
+
+
4. Display the cache group tables:
```
@@ -129,15 +132,12 @@ Disconnecting...
Done.
```
-Note that the status of autorefresh has now changed to **On**.
-
-```
-Autorefresh State: On
-```
## Task 2: Load the OE cache groups
-Now do the same for the OE schema cache groups:
+Now do the same for the OE schema cache groups.
+
+1. Connect to the cache as the OE user:
```
@@ -155,6 +155,8 @@ Connection successful: DSN=sampledb;UID=oe;DataStore=/tt/db/sampledb;DatabaseCha
Command>
```
+2. Load the CG_PROMOTIONS cache group:
+
```
LOAD CACHE GROUP oe.cg_promotions COMMIT EVERY 1024 ROWS;
@@ -165,6 +167,8 @@ LOAD CACHE GROUP oe.cg_promotions COMMIT EVERY 1024 ROWS;
2 cache instances affected.
```
+3. Load the CG_PROD_INVENTORY cache group:
+
```
LOAD CACHE GROUP oe.cg_prod_inventory COMMIT EVERY 1024 ROWS;
@@ -175,6 +179,8 @@ LOAD CACHE GROUP oe.cg_prod_inventory COMMIT EVERY 1024 ROWS;
288 cache instances affected.
```
+4. Load the CG_CUST_ORDERS cache group:
+
```
LOAD CACHE GROUP oe.cg_cust_orders COMMIT EVERY 1024 ROWS;
@@ -185,12 +191,16 @@ LOAD CACHE GROUP oe.cg_cust_orders COMMIT EVERY 1024 ROWS;
319 cache instances affected.
```
+5. Update optimizer statistics for all the tables in the OE schema:
+
```
statsupdate;
```
+6. Display the cache group tables:
+
```
tables;
@@ -208,6 +218,8 @@ tables;
7 tables found.
```
+7. Check the row count for CUSTOMERS:
+
```
select count(*) from customers;
@@ -219,6 +231,8 @@ select count(*) from customers;
1 row found.
```
+8. Check the row count for INVENTORIES:
+
```
select count(*) from inventories;
@@ -230,6 +244,8 @@ select count(*) from inventories;
1 row found.
```
+9. Check the row count for ORDERS:
+
```
select count(*) from orders;
@@ -241,6 +257,8 @@ select count(*) from orders;
1 row found.
```
+10. Check the row count for ORDER_ITEMS:
+
```
select count(*) from order_items;
@@ -252,6 +270,8 @@ select count(*) from order_items;
1 row found.
```
+11. Check the row count for PRODUCT_DESCRIPTIONS:
+
```
select count(*) from product_descriptions;
@@ -263,6 +283,8 @@ select count(*) from product_descriptions;
1 row found.
```
+12. Check the row count for PRODUCT_INFORMATION:
+
```
select count(*) from product_information;
@@ -274,6 +296,8 @@ select count(*) from product_information;
1 row found.
```
+13. Check the row count for PROMOTIONS:
+
```
select count(*) from promotions;
@@ -285,6 +309,8 @@ select count(*) from promotions;
1 row found.
```
+14. Quit out of ttIsql:
+
```
quit
diff --git a/timesten/cache-introduction/09-cache-refresh/cache-refresh.md b/timesten/cache-introduction/09-cache-refresh/cache-refresh.md
index a18da2c50..daa77c40c 100644
--- a/timesten/cache-introduction/09-cache-refresh/cache-refresh.md
+++ b/timesten/cache-introduction/09-cache-refresh/cache-refresh.md
@@ -6,7 +6,7 @@ With READONLY cache groups, the Oracle database is the master of the data. The d
In this lab you will execute some DML statements on the tables in Oracle and observe those changes being automatically propagated to the corresponding tables cached in TimesTen.
-**Estimated Lab Time:** 5 minutes
+**Estimated Lab Time:** 10 minutes
### Objectives
@@ -28,6 +28,18 @@ Your existing terminal session to tthost1 will be referred to as the **primary**
1. Open a _second_ terminal session, as the user **oracle**, in the workshop compute instance, either via NoVNC or SSH. In that terminal session, connect to the TimesTen host (tthost1) using ssh. This session will be referred to as the **secondary** session.
+ If you are using SSH, then you can just create a second SSH session, as the **oracle** user, to the workshop compute instance and then in that session **ssh** into **tthost1**.
+
+ If you are using the NoVNC desktop then there are several ways to open an additional terminal window:
+
+ - Click on **Activities** in the linux Menu bar, _right_ click on the **Terminal** icon in the list that appears and choose **New Window**
+
+ - If you already have at least one terminal window open, click on the **Terminal** item in the Linux menu bar and choose **New window **
+
+ - _Double_ click the **Terminal** icon on the linux desktop.
+
+ Once you have a new window, **ssh** into **tthost1**.
+
## Task 2: Verify the refresh of INSERT operations
1. In your _primary_ session connect to the TimesTen cache as the OE schema user:
diff --git a/timesten/cache-introduction/10-oltp-performance/oltp-performance.md b/timesten/cache-introduction/10-oltp-performance/oltp-performance.md
index f5c888d0d..865ff66f2 100644
--- a/timesten/cache-introduction/10-oltp-performance/oltp-performance.md
+++ b/timesten/cache-introduction/10-oltp-performance/oltp-performance.md
@@ -6,7 +6,7 @@ In this lab, you will use a simple benchmark program to run a (read-only) OLTP w
You will use a standard TimesTen benchmark program, TptBm, in this case a version that connects to the target database using the Oracle Call Interface (OCI) API. The program can run against either TimesTen or Oracle and performs the same operations in both cases. The source code for the tptbmOCI program is available in the _host VM_ in the directory **~/lab/src**.
-**Estimated Lab Time:** 5 minutes
+**Estimated Lab Time:** 6 minutes
There is a single table used for this benchmark, APPUSER.VPN_USERS:
diff --git a/timesten/cache-introduction/11-query-performance/query-performance.md b/timesten/cache-introduction/11-query-performance/query-performance.md
index 672886c58..3195ee311 100644
--- a/timesten/cache-introduction/11-query-performance/query-performance.md
+++ b/timesten/cache-introduction/11-query-performance/query-performance.md
@@ -4,7 +4,7 @@
In this lab, you will run some typical queries against the TimesTen cache and against the Oracle database to illustrate the performance benefit of TimesTen.
-**Estimated Lab Time:** 5 minutes
+**Estimated Lab Time:** 8 minutes
**IMPORTANT:** As noted in the previous lab there are many factors that can affect performance. As a result, the performance numbers shown in this lab are indicative only. The numbers that _you_ measure will differ and may be slightly better or slightly worse.
diff --git a/timesten/cache-introduction/12-dynamic-caching/dynamic-caching.md b/timesten/cache-introduction/12-dynamic-caching/dynamic-caching.md
index 6a259c685..5f750f630 100644
--- a/timesten/cache-introduction/12-dynamic-caching/dynamic-caching.md
+++ b/timesten/cache-introduction/12-dynamic-caching/dynamic-caching.md
@@ -4,7 +4,7 @@
In this lab, you will learn the difference between static and dynamic cache groups.
-**Estimated Lab Time:** 5 minutes
+**Estimated Lab Time:** 10 minutes
So far, the cache groups that you have been working with are what are known as static cache groups. With static cache groups, you pre-load the cache group with the data that you wish to cache and then the TimesTen autorefresh mechanism ensures that any inserts, updates or deletes that occur on Oracle are captured and propagated to the cache to refresh the cached tables.
@@ -20,7 +20,7 @@ As a result, a cache miss is significantly more expensive than a cache hit since
- Create a dynamic readonly cache group.
- Run some queries that trigger cache misses and cache hits.
-- Observe the behaviour and how it differs from a static cache group.
+- Observe the behavior and how it differs from a static cache group.
### Prerequisites
@@ -134,7 +134,7 @@ select count(*) from appuser.child;
There is no data in the cached tables.
-## Task 2: Run some queries and observe the behaviour
+## Task 2: Run some queries and observe the behavior
1. First, run a query that references the root table's (PARENT table) primary key:
diff --git a/timesten/cache-introduction/13-shutdown/shutdown.md b/timesten/cache-introduction/13-shutdown/shutdown.md
index 642360b99..9e2e5a500 100644
--- a/timesten/cache-introduction/13-shutdown/shutdown.md
+++ b/timesten/cache-introduction/13-shutdown/shutdown.md
@@ -1,10 +1,10 @@
-# Shutdown the TimesTen cache and instance
+# Shut down the TimesTen cache and instance
## Introduction
In this final lab, you will cleanly shut down the TimesTen cache and the TimesTen instance that manages it.
-**Estimated Lab Time:** 2 minutes
+**Estimated Lab Time:** 3 minutes
### Objectives
diff --git a/timesten/cache-introduction/workshops/desktop/manifest.json b/timesten/cache-introduction/workshops/desktop/manifest.json
index d88f1eb2c..11ade1b39 100644
--- a/timesten/cache-introduction/workshops/desktop/manifest.json
+++ b/timesten/cache-introduction/workshops/desktop/manifest.json
@@ -9,62 +9,57 @@
"filename": "../../01-introduction/introduction.md"
},
{
- "title": "Lab 1: Using noVNC Remote Desktop",
- "description": "Using noVNC Remote Desktop",
- "filename": "../../00-novnc/novnc-livelabs.md"
+ "title": "Lab 1: Connect to the workshop compute instance",
+ "description": "Connect to the workshop compute instance",
+ "filename": "../../00-verify-compute/verify-compute-desktop.md"
},
{
- "title": "Lab 2: Connect to the workshop compute instance using SSH",
- "description": "How to connect to the Cloud Instance using SSH",
- "filename": "../../03-connect-to-instance/connect-to-instance-desktop.md"
- },
- {
- "title": "Lab 3: Initialize the workshop environment",
+ "title": "Lab 2: Initialize the workshop environment",
"description": "Initialize the workshop environmentEnvironment",
"filename": "../../04-initialize-environment/initialize-environment.md"
},
{
- "title": "Lab 4: Create a TimesTen instance",
+ "title": "Lab 3: Create a TimesTen instance",
"description": "Create and start a TimesTen instance and execute some basic commands",
"filename": "../../05-create-instance/create-instance.md"
},
{
- "title": "Lab 5: Prepare the Oracle database for caching",
+ "title": "Lab 4: Prepare the Oracle database for caching",
"description": "Prepare the Oracle database to support TimesTen caching",
"filename": "../../06-prepare-oracle/prepare-oracle.md"
},
{
- "title": "Lab 6: Prepare the TimesTen cache",
+ "title": "Lab 5: Prepare the TimesTen cache",
"description": "Create a TimesTen database and set it up as a cache",
"filename": "../../07-prepare-cache/prepare-cache.md"
},
{
- "title": "Lab 7: Load Oracle data into the cache",
+ "title": "Lab 6: Load Oracle data into the cache",
"description": "Perform the initial data load from Oracle to establish the cache",
"filename": "../../08-load-cache/load-cache.md"
},
{
- "title": "Lab 8: Verify automatic cache refresh",
+ "title": "Lab 7: Verify automatic cache refresh",
"description": "Demonstrate the cache refresh mechanism",
"filename": "../../09-cache-refresh/cache-refresh.md"
},
{
- "title": "Lab 9: Measure OLTP performance improvement",
+ "title": "Lab 8: Measure OLTP performance improvement",
"description": "Run a simple OLTP benchmark to compare the performance with and without the cache",
"filename": "../../10-oltp-performance/oltp-performance.md"
},
{
- "title": "Lab 10: Measure query performance improvement",
+ "title": "Lab 9: Measure query performance improvement",
"description": "Use a query timing program to compare query performance with and without the cache",
"filename": "../../11-query-performance/query-performance.md"
},
{
- "title": "Lab 11: Dynamic caching",
+ "title": "Lab 10: Dynamic caching",
"filename": "../../12-dynamic-caching/dynamic-caching.md"
},
{
- "title": "Lab 12: Shutdown the TimesTen cache and instance",
- "description": "Perform an orderly shutdown of TimesTen",
+ "title": "Lab 11: Shut down the TimesTen cache and instance",
+ "description": "Perform an orderly shut down of TimesTen",
"filename": "../../13-shutdown/shutdown.md"
},
{
diff --git a/timesten/cache-introduction/workshops/freetier/manifest.json b/timesten/cache-introduction/workshops/freetier/manifest.json
index a298146de..0380d6828 100644
--- a/timesten/cache-introduction/workshops/freetier/manifest.json
+++ b/timesten/cache-introduction/workshops/freetier/manifest.json
@@ -9,7 +9,7 @@
"filename": "../../01-introduction/introduction.md"
},
{
- "title": "Get started",
+ "title": "Get started - Cloud Login",
"description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
"filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login.md"
},
@@ -24,13 +24,13 @@
"filename": "../../00-setup-compute/setup-compute.md"
},
{
- "title": "Lab 3: Using noVNC Remote Desktop",
- "description": "Using noVNC Remote Desktop",
- "filename": "../../00-novnc/novnc-owntenancy.md"
+ "title": "Lab 3: Connect to the workshop compute instance using NoVNC Remote Desktop",
+ "description": "Connect using noVNC Remote Desktop",
+ "filename": "../../00-verify-compute/verify-compute-freetier.md"
},
{
"title": "Lab 4: Connect to the workshop compute instance using SSH (optional)",
- "description": "How to connect to the Cloud Instance",
+ "description": "Connect using SSH",
"filename": "../../03-connect-to-instance/connect-to-instance-freetier.md"
},
{
@@ -78,8 +78,8 @@
"filename": "../../12-dynamic-caching/dynamic-caching.md"
},
{
- "title": "Lab 14: Shutdown the TimesTen cache and instance",
- "description": "Perform an orderly shutdown of TimesTen",
+ "title": "Lab 14: Shut down the TimesTen cache and instance",
+ "description": "Perform an orderly shut down of TimesTen",
"filename": "../../13-shutdown/shutdown.md"
},
{
diff --git a/timesten/cache-introduction/workshops/livelabs/manifest.json b/timesten/cache-introduction/workshops/livelabs/manifest.json
index 2875bb5d2..c4ecc0a86 100644
--- a/timesten/cache-introduction/workshops/livelabs/manifest.json
+++ b/timesten/cache-introduction/workshops/livelabs/manifest.json
@@ -9,67 +9,57 @@
"filename": "../../01-introduction/introduction.md"
},
{
- "title": "Lab 1: Environment Setup",
- "description": "Verify Setup of compute instance",
- "filename": "https://oracle-livelabs.github.io/common/labs/verify-compute/verify-compute-novnc.md"
+ "title": "Lab 1: Connect to the workshop compute instance",
+ "description": "Connect to the workshop compute instance",
+ "filename": "../../00-verify-compute/verify-compute-livelabs.md"
},
{
- "title": "Lab 2: Connect to the workshop compute instance",
- "description": "How to connect to the Cloud Instance",
- "filename": "../../03-connect-to-instance/connect-to-instance-livelabs.md"
- },
- {
- "title": "Lab 3: Using noVNC Remote Desktop",
- "description": "Using noVNC Remote Desktop",
- "filename": "../../00-novnc/novnc-livelabs.md"
- },
- {
- "title": "Lab 4: Initialize the workshop environment",
+ "title": "Lab 2: Initialize the workshop environment",
"description": "Initialize the workshop environmentEnvironment",
"filename": "../../04-initialize-environment/initialize-environment.md"
},
{
- "title": "Lab 5: Create a TimesTen instance",
+ "title": "Lab 3: Create a TimesTen instance",
"description": "Create and start a TimesTen instance and execute some basic commands",
"filename": "../../05-create-instance/create-instance.md"
},
{
- "title": "Lab 6: Prepare the Oracle database for caching",
+ "title": "Lab 4: Prepare the Oracle database for caching",
"description": "Prepare the Oracle database to support TimesTen caching",
"filename": "../../06-prepare-oracle/prepare-oracle.md"
},
{
- "title": "Lab 7: Prepare the TimesTen cache",
+ "title": "Lab 5: Prepare the TimesTen cache",
"description": "Create a TimesTen database and set it up as a cache",
"filename": "../../07-prepare-cache/prepare-cache.md"
},
{
- "title": "Lab 8: Load Oracle data into the cache",
+ "title": "Lab 6: Load Oracle data into the cache",
"description": "Perform the initial data load from Oracle to establish the cache",
"filename": "../../08-load-cache/load-cache.md"
},
{
- "title": "Lab 9: Verify automatic cache refresh",
+ "title": "Lab 7: Verify automatic cache refresh",
"description": "Demonstrate the cache refresh mechanism",
"filename": "../../09-cache-refresh/cache-refresh.md"
},
{
- "title": "Lab 10: Measure OLTP performance improvement",
+ "title": "Lab 8: Measure OLTP performance improvement",
"description": "Run a simple OLTP benchmark to compare the performance with and without the cache",
"filename": "../../10-oltp-performance/oltp-performance.md"
},
{
- "title": "Lab 11: Measure query performance improvement",
+ "title": "Lab 9: Measure query performance improvement",
"description": "Use a query timing program to compare query performance with and without the cache",
"filename": "../../11-query-performance/query-performance.md"
},
{
- "title": "Lab 12: Dynamic caching",
+ "title": "Lab 10: Dynamic caching",
"filename": "../../12-dynamic-caching/dynamic-caching.md"
},
{
- "title": "Lab 13: Shutdown the TimesTen cache and instance",
- "description": "Perform an orderly shutdown of TimesTen",
+ "title": "Lab 11: Shut down the TimesTen cache and instance",
+ "description": "Perform an orderly shut down of TimesTen",
"filename": "../../13-shutdown/shutdown.md"
},
{