feat: switch syd04 to PER DC (#821)

surajsbharadwaj · web-flow · commit 603a72268d76 · 2024-04-30T19:38:10.000+02:00
diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml
@@ -30,7 +30,6 @@ offerings:
       - name: powervs-import-workspace
         mark_ready: false
         install_type: fullstack
-        import_only: true
         scc:
           instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
           region: us-south
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -129,7 +129,7 @@
                                     "value": "sao04"
                                 },
                                 {
-                                    "displayname": "Sydney 04 (syd04)",
+                                    "displayname": "Sydney 04 (syd04) PER",
                                     "value": "syd04"
                                 },
                                 {
@@ -521,7 +521,7 @@
                                     "value": "sao04"
                                 },
                                 {
-                                    "displayname": "Sydney 04 (syd04)",
+                                    "displayname": "Sydney 04 (syd04) PER",
                                     "value": "syd04"
                                 },
                                 {
@@ -567,19 +567,19 @@
                                     "value": "custom"
                                 },
                                 {
-                                    "displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-01-01)",
+                                    "displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-02-01)",
                                     "value": "aix_xs"
                                 },
                                 {
-                                    "displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-01-01)",
+                                    "displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-02-01)",
                                     "value": "aix_s"
                                 },
                                 {
-                                    "displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-01-01)",
+                                    "displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-02-01)",
                                     "value": "aix_m"
                                 },
                                 {
-                                    "displayname": "AIX - L (14cpu,512GB,disk-2000GB,7300-01-01)",
+                                    "displayname": "AIX - L (14cpu,512GB,disk-2000GB,7300-02-01)",
                                     "value": "aix_l"
                                 },
                                 {
@@ -666,8 +666,8 @@
                                     "value": "none"
                                 },
                                 {
-                                    "displayname": "AIX - 7300-01-01",
-                                    "value": "7300-01-01"
+                                    "displayname": "AIX - 7300-02-01",
+                                    "value": "7300-02-01"
                                 },
                                 {
                                     "displayname": "AIX - 7200-05-07",
@@ -1038,7 +1038,7 @@
                                     "value": "sao04"
                                 },
                                 {
-                                    "displayname": "Sydney 04 (syd04)",
+                                    "displayname": "Sydney 04 (syd04) PER",
                                     "value": "syd04"
                                 },
                                 {
@@ -1369,7 +1369,7 @@
                                     "value": "sao04"
                                 },
                                 {
-                                    "displayname": "Sydney 04 (syd04)",
+                                    "displayname": "Sydney 04 (syd04) PER",
                                     "value": "syd04"
                                 },
                                 {
diff --git a/modules/powervs-vpc-landing-zone/README.md b/modules/powervs-vpc-landing-zone/README.md
@@ -95,7 +95,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
 | <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 5.21.0 |
 | <a name="module_landing_zone_configure_network_services"></a> [landing\_zone\_configure\_network\_services](#module\_landing\_zone\_configure\_network\_services) | ../ansible-configure-network-services | n/a |
 | <a name="module_landing_zone_configure_proxy_server"></a> [landing\_zone\_configure\_proxy\_server](#module\_landing\_zone\_configure\_proxy\_server) | ../ansible-configure-network-services | n/a |
-| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-workspace/ibm | 1.11.0 |
+| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-workspace/ibm | 1.12.0 |
 
 ### Resources
 
diff --git a/modules/powervs-vpc-landing-zone/main.tf b/modules/powervs-vpc-landing-zone/main.tf
@@ -48,7 +48,7 @@ module "landing_zone_configure_network_services" {
 
 module "powervs_infra" {
   source    = "terraform-ibm-modules/powervs-workspace/ibm"
-  version   = "1.11.0"
+  version   = "1.12.0"
   providers = { ibm = ibm.ibm-pi }
 
   pi_zone                       = var.powervs_zone
diff --git a/reference-architectures/extension/deploy-arch-ibm-pvs-inf-extension.md b/reference-architectures/extension/deploy-arch-ibm-pvs-inf-extension.md
@@ -1,7 +1,7 @@
 ---
 copyright:
   years: 2024
-lastupdated: "2024-04-14"
+lastupdated: "2024-05-01"
 
 keywords:
 
@@ -11,7 +11,7 @@ authors:
   - name: Arnold Beilmann
   - name: Suraj Bharadwaj
 
-version: v4.9.1
+version: v4.10.0
 
 production: true
 
@@ -39,7 +39,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance="SAPCertified"}
-{: toc-version="4.9.1"}
+{: toc-version="4.10.0"}
 
 The Power Virtual Server with VPC landing zone as variation 'Extend Power Virtual Server with VPC landing zone' creates an additional Power Virtual Server workspace and connects it with the already created Power Virtual Server with VPC landing zone. It builds on the existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'.
 
diff --git a/reference-architectures/full-stack/deploy-arch-ibm-pvs-inf-full-stack.md b/reference-architectures/full-stack/deploy-arch-ibm-pvs-inf-full-stack.md
@@ -1,7 +1,7 @@
 ---
 copyright:
   years: 2024
-lastupdated: "2024-04-14"
+lastupdated: "2024-05-01"
 
 keywords:
 
@@ -11,7 +11,7 @@ authors:
   - name: Arnold Beilmann
   - name: Suraj Bharadwaj
 
-version: v4.9.1
+version: v4.10.0
 
 # Whether the reference architecture is published to Cloud Docs production.
 # When set to false, the file is available only in staging. Default is false.
@@ -41,7 +41,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance="SAPCertified"}
-{: toc-version="4.9.1"}
+{: toc-version="4.10.0"}
 
 The PowerVS workspace deployment of the Power Virtual Server with VPC landing zone creates VPC services and a Power Virtual Server workspace and interconnects them.
 
diff --git a/reference-architectures/import-workspace/deploy-arch-ibm-pvs-inf-import-workspace.md b/reference-architectures/import-workspace/deploy-arch-ibm-pvs-inf-import-workspace.md
@@ -1,7 +1,7 @@
 ---
 copyright:
   years: 2024
-lastupdated: "2024-04-14"
+lastupdated: "2024-05-01"
 
 keywords:
 
@@ -11,7 +11,7 @@ authors:
   - name: Arnold Beilmann
   - name: Stafania Saju
 
-version: v4.9.1
+version: v4.10.0
 
 production: true
 
@@ -38,7 +38,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance="SAPCertified"}
-{: toc-version="4.9.1"}
+{: toc-version="4.10.0"}
 
 This solution helps to install the deployable architecture ['Power Virtual Server for SAP HANA'](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-pvs-sap-9aa6135e-75d5-467e-9f4a-ac2a21c069b8-global) on top of a pre-existing Power Virtual Server(PowerVS) landscape. 'Power Virtual Server for SAP HANA' automation requires a schematics workspace id for installation. The 'import-workspace' solution creates a schematics workspace by taking pre-existing VPC and PowerVS infrastructure resource details as inputs. The ID of this schematics workspace will be the pre-requisite workspace id required by 'Power Virtual Server for SAP HANA' to create and configure the PowerVS instances for SAP on top of the existing infrastructure.
 
diff --git a/reference-architectures/quickstart/deploy-arch-ibm-pvs-inf-quickstart.md b/reference-architectures/quickstart/deploy-arch-ibm-pvs-inf-quickstart.md
@@ -1,7 +1,7 @@
 ---
 copyright:
   years: 2024
-lastupdated: "2024-04-14"
+lastupdated: "2024-05-01"
 
 keywords:
 
@@ -11,7 +11,7 @@ authors:
   - name: Arnold Beilmann
   - name: Stafania Saju
 
-version: v4.9.1
+version: v4.10.0
 
 # Whether the reference architecture is published to Cloud Docs production.
 # When set to false, the file is available only in staging. Default is false.
@@ -41,7 +41,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance=""}
-{: toc-version="4.9.1"}
+{: toc-version="4.10.0"}
 
 Quickstart deployment of the Power Virtual Server with VPC landing zone creates VPC services, a Power Virtual Server workspace, and interconnects them. It also deploys a Power Virtual Server of chosen T-shirt size or custom configuration. Supported Os are Aix, IBM i, and Linux images.
 
diff --git a/solutions/extension/README.md b/solutions/extension/README.md
@@ -45,7 +45,7 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-workspace/ibm | 1.11.0 |
+| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-workspace/ibm | 1.12.0 |
 
 ### Resources
 
diff --git a/solutions/extension/main.tf b/solutions/extension/main.tf
@@ -1,6 +1,6 @@
 module "powervs_infra" {
   source  = "terraform-ibm-modules/powervs-workspace/ibm"
-  version = "1.11.0"
+  version = "1.12.0"
 
   pi_zone                       = var.powervs_zone
   pi_resource_group_name        = var.powervs_resource_group_name
diff --git a/solutions/full-stack/README.md b/solutions/full-stack/README.md
@@ -62,7 +62,7 @@ No resources.
 | <a name="input_landing_zone_configuration"></a> [landing\_zone\_configuration](#input\_landing\_zone\_configuration) | VPC landing zone configuration. | `string` | n/a | yes |
 | <a name="input_nfs_server_config"></a> [nfs\_server\_config](#input\_nfs\_server\_config) | Configuration for the NFS server. 'size' is in GB, 'mount\_path' defines the mount point on os. Set 'configure\_nfs\_server' to false to ignore creating volume. | <pre>object({<br>    size       = number<br>    mount_path = string<br>  })</pre> | <pre>{<br>  "mount_path": "/nfs",<br>  "size": 1000<br>}</pre> | no |
 | <a name="input_powervs_backup_network"></a> [powervs\_backup\_network](#input\_powervs\_backup\_network) | Name of the IBM Cloud PowerVS backup network and CIDR to create. | <pre>object({<br>    name = string<br>    cidr = string<br>  })</pre> | <pre>{<br>  "cidr": "10.52.0.0/24",<br>  "name": "bkp_net"<br>}</pre> | no |
-| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md) | `list(string)` | <pre>[<br>  "IBMi-75-03-2924-1",<br>  "IBMi-74-09-2984-1",<br>  "7300-00-01",<br>  "7200-05-07",<br>  "SLES15-SP4-SAP",<br>  "SLES15-SP4-SAP-NETWEAVER",<br>  "RHEL8-SP6-SAP",<br>  "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
+| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md) | `list(string)` | <pre>[<br>  "IBMi-75-03-2924-1",<br>  "IBMi-74-09-2984-1",<br>  "7300-02-01",<br>  "7200-05-07",<br>  "SLES15-SP4-SAP",<br>  "SLES15-SP4-SAP-NETWEAVER",<br>  "RHEL8-SP6-SAP",<br>  "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
 | <a name="input_powervs_management_network"></a> [powervs\_management\_network](#input\_powervs\_management\_network) | Name of the IBM Cloud PowerVS management subnet and CIDR to create. | <pre>object({<br>    name = string<br>    cidr = string<br>  })</pre> | <pre>{<br>  "cidr": "10.51.0.0/24",<br>  "name": "mgmt_net"<br>}</pre> | no |
 | <a name="input_powervs_resource_group_name"></a> [powervs\_resource\_group\_name](#input\_powervs\_resource\_group\_name) | Existing IBM Cloud resource group name. | `string` | n/a | yes |
 | <a name="input_powervs_zone"></a> [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location where IBM PowerVS infrastructure will be created. | `string` | n/a | yes |
diff --git a/solutions/full-stack/docs/catalog_image_names.md b/solutions/full-stack/docs/catalog_image_names.md
@@ -3,32 +3,23 @@
 | 7100-05-09                    |
 | 7200-05-03                    |
 | 7200-05-05                    |
-| 7200-05-06                    |
+| 7200-05-07                    |
 | 7300-00-01                    |
 | 7300-01-01                    |
-| 7300-01-02                    |
+| 7300-02-01                    |
 | CentOS-Stream-8               |
 | CentOS-Stream-9               |
 | IBMi-71-11-2924-8             |
 | IBMi-71-11-2984-8             |
-| IBMi-72-09-2924-8             |
 | IBMi-72-09-2924-9             |
-| IBMi-72-09-2984-8             |
 | IBMi-72-09-2984-9             |
-| IBMi-73-13-2924-1             |
-| IBMi-73-13-2924-2             |
-| IBMi-73-13-2984-1             |
-| IBMi-73-13-2984-2             |
-| IBMi-74-07-2924-1             |
-| IBMi-74-07-2984-1             |
-| IBMi-74-08-2924-1             |
-| IBMi-74-08-2984-1             |
-| IBMi-75-01-2924-2             |
-| IBMi-75-01-2984-2             |
+| IBMi-73-13-2924-3             |
+| IBMi-73-13-2984-3             |
+| IBMi-74-09-2924-1             |
+| IBMi-74-09-2984-1             |
 | IBMi-75-03-2924-1             |
 | IBMi-75-03-2984-1             |
-| IBMi_COR-74-07-2              |
-| IBMi_COR-74-08-1              |
+| IBMi_COR-74-09-1              |
 | Linux-CentOS-8-3              |
 | Linux-RHEL-SAP-8-1            |
 | Linux-RHEL-SAP-8-2            |
@@ -47,11 +38,15 @@
 | RHEL8-SP8                     |
 | RHEL8-SP8-BYOL                |
 | RHEL8-SP8-SAP                 |
+| RHEL8-SP8-SAP-BYOL            |
 | RHEL8-SP8-SAP-NETWEAVER       |
+| RHEL8-SP8-SAP-NETWEAVER-BYOL  |
 | RHEL9-SP2                     |
 | RHEL9-SP2-BYOL                |
 | RHEL9-SP2-SAP                 |
+| RHEL9-SP2-SAP-BYOL            |
 | RHEL9-SP2-SAP-NETWEAVER       |
+| RHEL9-SP2-SAP-NETWEAVER-BYOL  |
 | SLES15-SP2-SAP                |
 | SLES15-SP2-SAP-BYOL           |
 | SLES15-SP2-SAP-NETWEAVER      |
diff --git a/solutions/full-stack/variables.tf b/solutions/full-stack/variables.tf
@@ -142,7 +142,7 @@ variable "cloud_connection" {
 variable "powervs_image_names" {
   description = "List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md)"
   type        = list(string)
-  default     = ["IBMi-75-03-2924-1", "IBMi-74-09-2984-1", "7300-00-01", "7200-05-07", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
+  default     = ["IBMi-75-03-2924-1", "IBMi-74-09-2984-1", "7300-02-01", "7200-05-07", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
 }
 
 variable "tags" {
diff --git a/solutions/import-workspace/catalogValidationValues.json.template b/solutions/import-workspace/catalogValidationValues.json.template
@@ -0,0 +1,17 @@
+{
+    "ibmcloud_api_key": $VALIDATION_APIKEY,
+    "access_host": {
+        "vsi_name": "val-gha-vsi",
+        "floating_ip": "149.81.6.27"
+    },
+    "proxy_server_ip_port": {
+        "ip": "10.30.10.4",
+        "port": 3128
+    },
+    "transit_gateway_name": "val-gha-transit-gateway",
+    "powervs_zone": "eu-de-1",
+    "powervs_workspace_guid": "4566c5e9-1b92-4484-8598-e0c8da943283",
+    "powervs_sshkey_name": "val-ssh-key",
+    "powervs_management_network_name": "mgmt_net",
+    "powervs_backup_network_name": "bkp_net"
+}
diff --git a/solutions/quickstart/locals.tf b/solutions/quickstart/locals.tf
@@ -4,10 +4,10 @@
 
 locals {
   ibm_powervs_quickstart_tshirt_sizes = {
-    "aix_xs"   = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "1", "memory" = "32", "storage" = "100", "tier" = "tier3", "image" = "7300-01-01" }
-    "aix_s"    = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "4", "memory" = "128", "storage" = "500", "tier" = "tier3", "image" = "7300-01-01" }
-    "aix_m"    = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "8", "memory" = "256", "storage" = "1000", "tier" = "tier3", "image" = "7300-01-01" }
-    "aix_l"    = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "14", "memory" = "512", "storage" = "2000", "tier" = "tier3", "image" = "7300-01-01" }
+    "aix_xs"   = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "1", "memory" = "32", "storage" = "100", "tier" = "tier3", "image" = "7300-02-01" }
+    "aix_s"    = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "4", "memory" = "128", "storage" = "500", "tier" = "tier3", "image" = "7300-02-01" }
+    "aix_m"    = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "8", "memory" = "256", "storage" = "1000", "tier" = "tier3", "image" = "7300-02-01" }
+    "aix_l"    = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "14", "memory" = "512", "storage" = "2000", "tier" = "tier3", "image" = "7300-02-01" }
     "ibm_i_xs" = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "0.25", "memory" = "8", "storage" = "100", "tier" = "tier3", "image" = "IBMi-75-03-2924-1" }
     "ibm_i_s"  = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "1", "memory" = "32", "storage" = "500", "tier" = "tier3", "image" = "IBMi-75-03-2924-1" }
     "ibm_i_m"  = { "sap_profile_id" = null, "server_type" = "s922", "proc_type" = "shared", "cores" = "2", "memory" = "64", "storage" = "1000", "tier" = "tier3", "image" = "IBMi-75-03-2924-1" }
diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf
@@ -49,8 +49,8 @@ variable "custom_profile_instance_boot_image" {
   type        = string
   default     = "none"
   validation {
-    condition     = contains(["RHEL8-SP6-SAP", "SLES15-SP4-SAP", "RHEL8-SP6-SAP-NETWEAVER", "SLES15-SP4-SAP-NETWEAVER", "7300-01-01", "7200-05-07", "7100-05-09", "IBMi-75-03-2924-1", "IBMi-75-03-2984-1", "IBMi-74-09-2984-1", "IBMi_COR-74-09-1", "none"], var.custom_profile_instance_boot_image)
-    error_message = "Only Following IBM catalog images are supported :  RHEL8-SP6-SAP, SLES15-SP4-SAP, RHEL8-SP6-SAP-NETWEAVER, SLES15-SP4-SAP-NETWEAVER, 7300-01-01, 7200-05-07, 7100-05-09, IBMi-75-03-2924-1, IBMi-75-03-2984-1, IBMi-74-09-2984-1, IBMi_COR-74-09-1, none"
+    condition     = contains(["RHEL8-SP6-SAP", "SLES15-SP4-SAP", "RHEL8-SP6-SAP-NETWEAVER", "SLES15-SP4-SAP-NETWEAVER", "7300-02-01", "7200-05-07", "7100-05-09", "IBMi-75-03-2924-1", "IBMi-75-03-2984-1", "IBMi-74-09-2984-1", "IBMi_COR-74-09-1", "none"], var.custom_profile_instance_boot_image)
+    error_message = "Only Following IBM catalog images are supported :  RHEL8-SP6-SAP, SLES15-SP4-SAP, RHEL8-SP6-SAP-NETWEAVER, SLES15-SP4-SAP-NETWEAVER, 7300-02-01, 7200-05-07, 7100-05-09, IBMi-75-03-2924-1, IBMi-75-03-2984-1, IBMi-74-09-2984-1, IBMi_COR-74-09-1, none"
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@`
`129`	`129`	`"value": "sao04"`
`130`	`130`	`},`
`131`	`131`	`{`
`132`		`- "displayname": "Sydney 04 (syd04)",`
	`132`	`+ "displayname": "Sydney 04 (syd04) PER",`
`133`	`133`	`"value": "syd04"`
`134`	`134`	`},`
`135`	`135`	`{`
`@@ -521,7 +521,7 @@`
`521`	`521`	`"value": "sao04"`
`522`	`522`	`},`
`523`	`523`	`{`
`524`		`- "displayname": "Sydney 04 (syd04)",`
	`524`	`+ "displayname": "Sydney 04 (syd04) PER",`
`525`	`525`	`"value": "syd04"`
`526`	`526`	`},`
`527`	`527`	`{`
`@@ -567,19 +567,19 @@`
`567`	`567`	`"value": "custom"`
`568`	`568`	`},`
`569`	`569`	`{`
`570`		`- "displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-01-01)",`
	`570`	`+ "displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-02-01)",`
`571`	`571`	`"value": "aix_xs"`
`572`	`572`	`},`
`573`	`573`	`{`
`574`		`- "displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-01-01)",`
	`574`	`+ "displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-02-01)",`
`575`	`575`	`"value": "aix_s"`
`576`	`576`	`},`
`577`	`577`	`{`
`578`		`- "displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-01-01)",`
	`578`	`+ "displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-02-01)",`
`579`	`579`	`"value": "aix_m"`
`580`	`580`	`},`
`581`	`581`	`{`
`582`		`- "displayname": "AIX - L (14cpu,512GB,disk-2000GB,7300-01-01)",`
	`582`	`+ "displayname": "AIX - L (14cpu,512GB,disk-2000GB,7300-02-01)",`
`583`	`583`	`"value": "aix_l"`
`584`	`584`	`},`
`585`	`585`	`{`
`@@ -666,8 +666,8 @@`
`666`	`666`	`"value": "none"`
`667`	`667`	`},`
`668`	`668`	`{`
`669`		`- "displayname": "AIX - 7300-01-01",`
`670`		`- "value": "7300-01-01"`
	`669`	`+ "displayname": "AIX - 7300-02-01",`
	`670`	`+ "value": "7300-02-01"`
`671`	`671`	`},`
`672`	`672`	`{`
`673`	`673`	`"displayname": "AIX - 7200-05-07",`
`@@ -1038,7 +1038,7 @@`
`1038`	`1038`	`"value": "sao04"`
`1039`	`1039`	`},`
`1040`	`1040`	`{`
`1041`		`- "displayname": "Sydney 04 (syd04)",`
	`1041`	`+ "displayname": "Sydney 04 (syd04) PER",`
`1042`	`1042`	`"value": "syd04"`
`1043`	`1043`	`},`
`1044`	`1044`	`{`
`@@ -1369,7 +1369,7 @@`
`1369`	`1369`	`"value": "sao04"`
`1370`	`1370`	`},`
`1371`	`1371`	`{`
`1372`		`- "displayname": "Sydney 04 (syd04)",`
	`1372`	`+ "displayname": "Sydney 04 (syd04) PER",`
`1373`	`1373`	`"value": "syd04"`
`1374`	`1374`	`},`
`1375`	`1375`	`{`