feat: reorg solution names and folders (#863)

Author: surajsbharadwaj

.catalog-onboard-pipeline.yaml

@@ -6,26 +6,26 @@ offerings:
     catalog_id: da12d6f3-3cb7-402e-9350-878837212a6e
     offering_id: 2dd486c7-b317-4aaa-907b-42671485ad96
     variations:
-      - name: powervs-workspace
+      - name: standard
         mark_ready: false
         install_type: fullstack
         scc:
           instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
           region: us-south
-      - name: powervs-quickstart
+      - name: standard-plus-vsi
         mark_ready: false
         install_type: fullstack
         scc:
           instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
           region: us-south
-      - name: powervs-workspace
+      - name: standard-extend
         mark_ready: false
         install_type: extension
         import_only: true
         scc:
           instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
           region: us-south
-      - name: powervs-import-workspace
+      - name: import
         mark_ready: false
         install_type: fullstack
         scc:

.github/workflows/ci.yml

@@ -13,4 +13,4 @@ jobs:
     with:
       craSCCv2: true
       craConfigYamlFile: "cra-config.yaml"
-      tfswitchDir: "solutions/full-stack"
+      tfswitchDir: "solutions/standard"

README.md

@@ -9,34 +9,34 @@
 ## Summary
 This repository contains deployable architecture solutions that help provision VPC landing zones, PowerVS workspaces, and interconnect them. The solutions are available in the IBM Cloud Catalog and can also be deployed without the catalog, except for the second solution below.
 
-Three solutions are offered:
-1. [PowerVS full-stack variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/full-stack)
+Four solutions are offered:
+1. [Standard](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard)
     - Creates a VPC and Power Virtual Server workspace, interconnects them, and configures OS network management services (SQUID proxy, NTP, NFS, and DNS services) using Ansible Galaxy collection roles [ibm.power_linux_sap collection](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/).
-2. [PowerVS extension variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/extension)
-    - Extends the full-stack solution by creating a new Power Virtual Server workspace in a different zone and interconnects with the previous solution.
+2. [Standard Extend](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-extend)
+    - Extends the standard solution by creating a new Power Virtual Server workspace in a different zone and interconnects with the previous solution.
     - This solution is typically used for **High Availability scenarios** where a single management VPC can be used to reach both PowerVS workspaces.
-3. [PowerVS quickstart variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/quickstart)
+3. [Quickstart (Standard plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-plus-vsi)
     - Creates a VPC and a Power Virtual Server workspace, interconnects them, and configures operating network management services (SQUID proxy, NTP, NFS, and DNS services) using Ansible Galaxy collection roles [ibm.power_linux_sap collection](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/).
     - Additionally creates a Power Virtual Server Instance of a selected t-shirt size.
     - This solution is typically utilized for **PoCs, demos, and quick onboarding** to PowerVS Infrastructure.
-4. [PowerVS import-workspace variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/import-workspace)
+4. [Import](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/import)
     - Takes information about an existing infrastructure and creates a schematics workspace.
     - The schematics workspace's ID and the outputs from it can be used to install the terraform solution 'Power Virtual Server for SAP HANA' on top of a pre-existing PowerVS infrastructure.
     - It creates the ACL and security group rules necessary for management services (NTP, NFS, DNS, and proxy server) and schematics engine access.
     - This solution is typically used for converting an existing Power Virtual Server landscape to a Schematics workspace.
 
 ## Reference architectures
-- [PowerVS Full-Stack Variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/full-stack/deploy-arch-ibm-pvs-inf-full-stack.md)
-- [PowerVS Extension Variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/extension/deploy-arch-ibm-pvs-inf-extension.md)
-- [PowerVS Quickstart Variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/quickstart/deploy-arch-ibm-pvs-inf-quickstart.md)
+- [Standard](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md)
+- [Standard Extend](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md)
+- [Quickstart (Standard plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md)
 
 ## Solutions
 | Variation  | Available on IBM Catalog  |  Requires IBM Schematics Workspace ID | Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastructure | Creates PowerVS Instance | Performs PowerVS OS Config |
 | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- |
-| [Full-Stack](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/full-stack)  | :heavy_check_mark:  | N/A  | :heavy_check_mark:  | :heavy_check_mark:  |  :heavy_check_mark: | N/A | N/A |
-| [Extension](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/extension)    | :heavy_check_mark:  |  :heavy_check_mark: |  N/A | N/A | :heavy_check_mark:  | N/A | N/A |
-| [Quickstart](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/quickstart)    | :heavy_check_mark:  |   N/A  | :heavy_check_mark:| :heavy_check_mark: | :heavy_check_mark:  | :heavy_check_mark: | N/A |
-| [Import-Workspace](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/import-workspace)    | :heavy_check_mark:  |   N/A  | N/A | N/A | N/A  | N/A | N/A |
+| [Standard](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard)  | :heavy_check_mark:  | N/A  | :heavy_check_mark:  | :heavy_check_mark:  |  :heavy_check_mark: | N/A | N/A |
+| [Standard Extend](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-extend)    | :heavy_check_mark:  |  :heavy_check_mark: |  N/A | N/A | :heavy_check_mark:  | N/A | N/A |
+| [Quickstart (Standard plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-plus-vsi)    | :heavy_check_mark:  |   N/A  | :heavy_check_mark:| :heavy_check_mark: | :heavy_check_mark:  | :heavy_check_mark: | N/A |
+| [Import](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/import)    | :heavy_check_mark:  |   N/A  | N/A | N/A | N/A  | N/A | N/A |
 
 
 ## Required IAM access policies
@@ -57,16 +57,6 @@ You need the following permissions to run this module.
         - **Direct Link** service
             - `Editor` platform access
 
-<!-- BEGIN OVERVIEW HOOK -->
-## Overview
-* [terraform-ibm-powervs-infrastructure](#terraform-ibm-powervs-infrastructure)
-* [Submodules](./modules)
-    * [powervs-vpc-landing-zone/subansible](./modules/powervs-vpc-landing-zone/submodules/ansible)
-    * [powervs-vpc-landing-zone/subfileshare-alb](./modules/powervs-vpc-landing-zone/submodules/fileshare-alb)
-    * [powervs-vpc-landing-zone](./modules/powervs-vpc-landing-zone)
-* [Contributing](#contributing)
-<!-- END OVERVIEW HOOK -->
-
 <!-- BEGIN CONTRIBUTING HOOK -->
 ## Contributing
 

cra-config.yaml

@@ -1,6 +1,6 @@
 version: "v1"
 CRA_TARGETS:
-  - CRA_TARGET: "solutions/full-stack"
+  - CRA_TARGET: "solutions/standard"
     PROFILE_ID: "bfacb71d-4b84-41ac-9825-e8a3a3eb7405" # SCC profile ID (currently set to IBM Cloud Framework for Financial Services 1.6.0 profile).
     CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json"
     CRA_ENVIRONMENT_VARIABLES: