This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 1191bff42a5 Minor fixes for references to Pure Storage FlashArray
(#10271)
1191bff42a5 is described below
commit 1191bff42a57180cfa7df6082eae02cc4e155ceb
Author: Simon Dodsley <[email protected]>
AuthorDate: Fri Nov 13 14:24:37 2026 -0500
Minor fixes for references to Pure Storage FlashArray (#10271)
* Minor fixes for references to Pure Storage FlashArray
* Update storage provider
* Fix merge artifacts from the main sync
Merging main (#13061, NVMe-TCP transport) left both the old and the new
"serial" declaration in FlashArrayAdapter.getVolumeByAddress, which
fails to compile, and dropped the FlashArray rename in the protocol
selection branch of AddPrimaryStorage.vue. Keep only main's declaration
and restore the rename.
Assisted-By: Claude Code claude-fable-5-1
* Move storage_pool provider rename to the 24.0 upgrade script
schema-42200to42210.sql was frozen when 4.22.1.0 shipped, so upgrades
from any released 4.22.1 or 4.23 would never run the UPDATE and existing
'Flash Array' pools would fail provider lookup. Put it in
schema-42300to2400.sql instead. Also revert the unrelated Adobe Flash
comment in the vendored jQuery and rename the pt_BR tooltip.
Assisted-By: Claude Code claude-fable-5-1
* Rename FlashArray in the el_GR tooltip
The el_GR locale gained the old 'Flash Array' wording on main after this
branch was last synced; align it with the other locales.
Assisted-By: Claude Code claude-fable-5-1
---
.../schema/src/main/resources/META-INF/db/schema-42300to2400.sql | 3 +++
.../cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java | 2 +-
plugins/storage/volume/flasharray/pom.xml | 2 +-
.../storage/datastore/adapter/flasharray/FlashArrayAdapter.java | 8 ++++----
.../datastore/adapter/flasharray/FlashArrayAdapterFactory.java | 2 +-
.../provider/FlashArrayPrimaryDatastoreProviderImpl.java | 2 +-
ui/public/locales/el_GR.json | 2 +-
ui/public/locales/en.json | 2 +-
ui/public/locales/pt_BR.json | 2 +-
ui/public/locales/te.json | 2 +-
ui/src/views/infra/AddPrimaryStorage.vue | 6 +++---
11 files changed, 18 insertions(+), 15 deletions(-)
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql
b/engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql
index 4e7d4c242d5..541caae23c1 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql
@@ -268,3 +268,6 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.nics',
'multi_network', 'tinyint(1)
CALL
`cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_network_offering',
'network_id', 'bigint(20) unsigned DEFAULT NULL COMMENT "associated network
this usage row belongs to"');
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.disk_offering', 'error_policy',
'VARCHAR(16) DEFAULT ''report'' COMMENT ''disk error policy
(report/stop/ignore/enospace) used by KVM hypervisor''');
+
+-- Rename persisted FlashArray provider name (plugin getName() changed from
'Flash Array' to 'FlashArray')
+UPDATE `cloud`.`storage_pool` SET `storage_provider_name` = 'FlashArray' WHERE
`storage_provider_name` = 'Flash Array';
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
index 13dab6942f8..cabb77f30e3 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
@@ -58,7 +58,7 @@ public abstract class MultipathSCSIAdapterBase implements
StorageAdaptor {
*/
static String[] SUPPORTED_OUI_LIST = {
"0002ac", // HPE Primera 3PAR
- "24a937" // Pure Flasharray
+ "24a937" // Pure Storage FlashArray
};
/**
diff --git a/plugins/storage/volume/flasharray/pom.xml
b/plugins/storage/volume/flasharray/pom.xml
index f26d29916f9..2479757ae5c 100644
--- a/plugins/storage/volume/flasharray/pom.xml
+++ b/plugins/storage/volume/flasharray/pom.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cloud-plugin-storage-volume-flasharray</artifactId>
- <name>Apache CloudStack Plugin - Storage Volume - Pure Flash Array</name>
+ <name>Apache CloudStack Plugin - Storage Volume - Pure Storage
FlashArray</name>
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
diff --git
a/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapter.java
b/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapter.java
index 4e12e3eb18d..50606e26e09 100644
---
a/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapter.java
+++
b/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapter.java
@@ -328,7 +328,7 @@ public class FlashArrayAdapter implements ProviderAdapter {
return volume;
} catch (Exception e) {
- // assume any exception is a not found. Flash returns 400's for
most errors
+ // assume any exception is a not found. FlashArray returns 400's
for most errors
return null;
}
}
@@ -391,7 +391,7 @@ public class FlashArrayAdapter implements ProviderAdapter {
return volume;
} catch (Exception e) {
- // assume any exception is a not found. Flash returns 400's for
most errors
+ // assume any exception is a not found. FlashArray returns 400's
for most errors
return null;
}
}
@@ -451,7 +451,7 @@ public class FlashArrayAdapter implements ProviderAdapter {
String origVolumeName = snapshot.getSource().getName();
// now "create" a new volume with the snapshot volume as its source
(basically a
- // Flash array copy)
+ // FlashArray copy)
// and overwrite to true (volume already exists, we are recreating it)
FlashArrayVolume input = new FlashArrayVolume();
input.setExternalName(origVolumeName);
@@ -509,7 +509,7 @@ public class FlashArrayAdapter implements ProviderAdapter {
}
// now "create" a new volume with the snapshot volume as its source
(basically a
- // Flash array copy)
+ // FlashArray copy)
// and overwrite to true (volume already exists, we are recreating it)
FlashArrayVolume payload = new FlashArrayVolume();
payload.setExternalName(normalizeName(pod,
destDataObject.getExternalName()));
diff --git
a/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapterFactory.java
b/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapterFactory.java
index de55b27884e..c0edcfe08e1 100644
---
a/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapterFactory.java
+++
b/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapterFactory.java
@@ -25,7 +25,7 @@ public class FlashArrayAdapterFactory implements
ProviderAdapterFactory {
@Override
public String getProviderName() {
- return "Flash Array";
+ return "FlashArray";
}
@Override
diff --git
a/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/provider/FlashArrayPrimaryDatastoreProviderImpl.java
b/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/provider/FlashArrayPrimaryDatastoreProviderImpl.java
index 0750ef2cc27..e76d5b3e7f6 100644
---
a/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/provider/FlashArrayPrimaryDatastoreProviderImpl.java
+++
b/plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/provider/FlashArrayPrimaryDatastoreProviderImpl.java
@@ -26,7 +26,7 @@ public class FlashArrayPrimaryDatastoreProviderImpl extends
AdaptivePrimaryDatas
@Override
public String getName() {
- return "Flash Array";
+ return "FlashArray";
}
}
diff --git a/ui/public/locales/el_GR.json b/ui/public/locales/el_GR.json
index ea86c1ad13a..b99a2bae95d 100644
--- a/ui/public/locales/el_GR.json
+++ b/ui/public/locales/el_GR.json
@@ -2087,7 +2087,7 @@
"label.primera.username.tooltip": "Το όνομα χρήστη με δικαιώματα επεξεργασίας",
"label.primera.url.tooltip": "URL που ορίζει το τελικό σημείο της συστοιχίας
αποθήκευσης Primera, με μορφή:
http[s]://HOSTNAME:PORT?cpg=NAME&hostset=NAME[&skipTlsValidation=true][&snapCPG=NAME][&taskWaitTimeoutMs=#][&keyttl=#][&connectTimeoutMs=#]
όπου οι τιμές σε [] είναι προαιρετικές.",
"label.flashArray.username.tooltip": "Το όνομα χρήστη με δικαιώματα
επεξεργασίας",
-"label.flashArray.url.tooltip": "URL που ορίζει το τελικό σημείο του Flash
Array, με μορφή:
http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#]
όπου οι τιμές σε [] είναι προαιρετικές.",
+"label.flashArray.url.tooltip": "URL που ορίζει το τελικό σημείο του
FlashArray, με μορφή:
http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#]
όπου οι τιμές σε [] είναι προαιρετικές.",
"label.primary": "Πρωτεύουσα",
"label.primary.storage": "Πρωτεύουσα αποθήκευση",
"label.primary.storage.allocated": "Εκχωρημένη πρωτεύουσα αποθήκευση",
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 720a62c494c..1c193e96d49 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -2102,7 +2102,7 @@
"label.primera.username.tooltip": "The username with edit privileges",
"label.primera.url.tooltip": "URL designating the Primera storage array
endpoint, formatted as:
http[s]://HOSTNAME:PORT?cpg=NAME&hostset=NAME[&skipTlsValidation=true][&snapCPG=NAME][&taskWaitTimeoutMs=#][&keyttl=#][&connectTimeoutMs=#]
where values in [] are optional.",
"label.flashArray.username.tooltip": "The username with edit privileges",
-"label.flashArray.url.tooltip": "URL designating the Flash Array endpoint,
formatted as:
http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#]
where values in [] are optional.",
+"label.flashArray.url.tooltip": "URL designating the FlashArray endpoint,
formatted as:
http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#]
where values in [] are optional.",
"label.primary": "Primary",
"label.primary.storage": "Primary Storage",
"label.primary.storage.allocated": "Primary Storage allocated",
diff --git a/ui/public/locales/pt_BR.json b/ui/public/locales/pt_BR.json
index c80c2c9a02c..09259496da5 100644
--- a/ui/public/locales/pt_BR.json
+++ b/ui/public/locales/pt_BR.json
@@ -1783,7 +1783,7 @@
"label.primera.url.tooltip": "URL designando o endpoint do array de
armazenamento Primera, formatado como:
http[s]://HOSTNAME:PORT?cpg=NAME&hostset=NAME[&skipTlsValidation=true][&snapCPG=NAME][&taskWaitTimeoutMs=#][&keyttl=#][&connectTimeoutMs=#]
onde valores em [] s\u00e3o opcionais.",
"label.primera.username.tooltip": "O nome de usu\u00e1rio com privil\u00e9gios
de edi\u00e7\u00e3o",
"label.flashArray.username.tooltip": "O nome de us\u00e1rio com
privil\u00e9gios de edi\u00e7\u00e3o",
-"label.flashArray.url.tooltip": "URL designando o endpoint Flash Array,
formatado como:
http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#]
onde valores em [] s\u00e3o opcionais.",
+"label.flashArray.url.tooltip": "URL designando o endpoint FlashArray,
formatado como:
http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#]
onde valores em [] s\u00e3o opcionais.",
"label.primary": "Prim\u00e1rio",
"label.primary.storage": "Armazenamento prim\u00e1rio",
"label.primary.storage.allocated": "Armazenamento prim\u00e1rio alocado",
diff --git a/ui/public/locales/te.json b/ui/public/locales/te.json
index e298a5352d1..cf3b4a9978f 100644
--- a/ui/public/locales/te.json
+++ b/ui/public/locales/te.json
@@ -1718,7 +1718,7 @@
"label.primera.username.tooltip": "సవరణ అధికారాలతో వినియోగదారు పేరు",
"label.primera.url.tooltip": "ప్రైమెరా స్టోరేజ్ అర్రే ఎండ్పాయింట్ని
నిర్దేశించే URL, ఇలా ఫార్మాట్ చేయబడింది:
http[s]://HOSTNAME:PORT?cpg=NAME&hostset=NAME[&skipTlsValidation=true][&snapCPG=NAME][&taskWaitTimeoutMs=#][&keyttl=#][&connectTimeoutMs=
",
"label.flashArray.username.tooltip": "సవరణ అధికారాలతో వినియోగదారు పేరు",
- "label.flashArray.url.tooltip": "Flash Array ముగింపు బిందువును నిర్దేశించే
URL, ఇలా ఫార్మాట్ చేయబడింది:
http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVers
",
+ "label.flashArray.url.tooltip": "FlashArray ముగింపు బిందువును నిర్దేశించే
URL, ఇలా ఫార్మాట్ చేయబడింది:
http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVers
",
"label.primary": "ప్రాథమిక",
"label.primary.storage": "ప్రాథమిక నిల్వ",
"label.primary.storage.allocated": "ప్రాథమిక నిల్వ కేటాయించబడింది",
diff --git a/ui/src/views/infra/AddPrimaryStorage.vue
b/ui/src/views/infra/AddPrimaryStorage.vue
index eeb3ebdd22c..91efa31f377 100644
--- a/ui/src/views/infra/AddPrimaryStorage.vue
+++ b/ui/src/views/infra/AddPrimaryStorage.vue
@@ -360,7 +360,7 @@
<a-input v-model:value="form.capacityIops"
:placeholder="apiParams.capacityiops.description" />
</a-form-item>
</div>
- <div v-if="form.provider === 'Flash Array'">
+ <div v-if="form.provider === 'FlashArray'">
<a-form-item name="flashArrayURL" ref="flashArrayURL">
<template #label>
<tooltip-label :title="$t('label.url')"
:tooltip="$t('label.flashArray.url.tooltip')"/>
@@ -829,7 +829,7 @@ export default {
if (value === 'PowerFlex') {
this.protocols = ['custom']
this.form.protocol = 'custom'
- } else if (value === 'Flash Array') {
+ } else if (value === 'FlashArray') {
this.protocols = ['FiberChannel', 'NVMeTCP']
this.form.protocol = 'FiberChannel'
} else if (value === 'Primera') {
@@ -959,7 +959,7 @@ export default {
params['details[0].api_username'] = values.primeraUsername
params['details[0].api_password'] = values.primeraPassword
url = values.primeraURL
- } else if (values.provider === 'Flash Array') {
+ } else if (values.provider === 'FlashArray') {
params['details[0].api_username'] = values.flashArrayUsername
params['details[0].api_password'] = values.flashArrayPassword
url = values.flashArrayURL