From 6e65792ef97dd7b7cc1daad098f6e5a3fbd9c4d7 Mon Sep 17 00:00:00 2001
From: surajsbharadwaj <suraj.bharadwaj@ibm.com>
Date: Wed, 7 May 2025 20:29:04 +0200
Subject: [PATCH 1/2] chore: auto validate the extend standard landscape

---
 .catalog-onboard-pipeline.yaml                              | 1 -
 .../standard-extend/catalogValidationValues.json.template   | 6 ++++++
 .../standard-plus-vsi/catalogValidationValues.json.template | 2 +-
 solutions/standard/catalogValidationValues.json.template    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 solutions/standard-extend/catalogValidationValues.json.template

diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml
index 5c6e5a14..dde5049e 100644
--- a/.catalog-onboard-pipeline.yaml
+++ b/.catalog-onboard-pipeline.yaml
@@ -21,7 +21,6 @@ offerings:
       - name: standard-extend
         mark_ready: false
         install_type: extension
-        import_only: true
         scc:
           instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
           region: us-south
diff --git a/solutions/standard-extend/catalogValidationValues.json.template b/solutions/standard-extend/catalogValidationValues.json.template
new file mode 100644
index 00000000..a8653503
--- /dev/null
+++ b/solutions/standard-extend/catalogValidationValues.json.template
@@ -0,0 +1,6 @@
+{
+  "ibmcloud_api_key": $VALIDATION_APIKEY,
+  "powervs_zone": "eu-de-2",
+  "powervs_resource_group_name": "Default",
+  "prerequisite_workspace_id": "us-east.workspace.globalcatalog-collection.2ad1e7ad"
+}
diff --git a/solutions/standard-plus-vsi/catalogValidationValues.json.template b/solutions/standard-plus-vsi/catalogValidationValues.json.template
index f3c8cbd6..1a7455ef 100644
--- a/solutions/standard-plus-vsi/catalogValidationValues.json.template
+++ b/solutions/standard-plus-vsi/catalogValidationValues.json.template
@@ -6,7 +6,7 @@
       "tshirt_size":"aix_xs",
       "image":"7300-03-00"
    },
-  "powervs_resource_group_name": "Automation",
+  "powervs_resource_group_name": "Default",
   "ssh_public_key": $SSH_PUB_KEY,
   "ssh_private_key": $SSH_PRV_KEY,
   "ansible_vault_password": "SecurePassw0rd!"
diff --git a/solutions/standard/catalogValidationValues.json.template b/solutions/standard/catalogValidationValues.json.template
index 1f5e8bb6..93bcf29d 100644
--- a/solutions/standard/catalogValidationValues.json.template
+++ b/solutions/standard/catalogValidationValues.json.template
@@ -1,6 +1,6 @@
 {
   "prefix": $PREFIX,
-  "powervs_resource_group_name": "Automation",
+  "powervs_resource_group_name": "Default",
   "powervs_zone": "eu-de-1",
   "external_access_ip": "0.0.0.0/0",
   "ssh_public_key": $SSH_PUB_KEY,

From 536386e9277055050108af3580e86d19fc5509f4 Mon Sep 17 00:00:00 2001
From: surajsbharadwaj <suraj.bharadwaj@ibm.com>
Date: Wed, 7 May 2025 21:34:23 +0200
Subject: [PATCH 2/2] chore: add features

---
 ibm_catalog.json | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ibm_catalog.json b/ibm_catalog.json
index 9d6931bb..57175997 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -533,9 +533,21 @@
                 "title": "Additional management configurations on VPC",
                 "description": "NFS as service, NTP forwarder, and DNS forwarder reachable from PowerVS Workspace"
               },
+              {
+                "title": "Client to site VPN with new or existing Secrets Manager instance",
+                "description": "Optional"
+              },
+              {
+                "title": "SCC Workload Protection instance",
+                "description": "Optional"
+              },
               {
                 "title": "Monitoring Instance and Monitoring Intel VSI Host",
                 "description": "Optional"
+              },
+              {
+                "title": "Bring your own image to PowerVS",
+                "description": "Optional"
               }
             ],
             "diagrams": [
@@ -1176,9 +1188,21 @@
                 "title": "Additional management configurations on VPC",
                 "description": "NFS as service, NTP forwarder, and DNS forwarder reachable from PowerVS Workspace"
               },
+              {
+                "title": "Client to site VPN with new or existing Secrets Manager instance",
+                "description": "Optional"
+              },
+              {
+                "title": "SCC Workload Protection instance",
+                "description": "Optional"
+              },
               {
                 "title": "Monitoring Instance and Monitoring Intel VSI Host",
                 "description": "Optional"
+              },
+              {
+                "title": "Bring your own image to PowerVS",
+                "description": "No"
               }
             ],
             "diagrams": [
@@ -1496,6 +1520,10 @@
               {
                 "title": "Power Virtual Server Workspace",
                 "description": "PowerVS Workspace with all required components in different zone. Used for HA scenario."
+              },
+              {
+                "title": "Bring your own image to PowerVS",
+                "description": "Optional"
               }
             ],
             "diagrams": [