Skip to content

Commit 1191bff

Browse files
sdodsleysdodsley
authored
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
1 parent 2f34b0c commit 1191bff

11 files changed

Lines changed: 18 additions & 15 deletions

File tree

‎engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,3 +268,6 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.nics', 'multi_network', 'tinyint(1)
268268
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"');
269269

270270
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''');
271+
272+
-- Rename persisted FlashArray provider name (plugin getName() changed from 'Flash Array' to 'FlashArray')
273+
UPDATE `cloud`.`storage_pool` SET `storage_provider_name` = 'FlashArray' WHERE `storage_provider_name` = 'Flash Array';

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public abstract class MultipathSCSIAdapterBase implements StorageAdaptor {
5858
*/
5959
static String[] SUPPORTED_OUI_LIST = {
6060
"0002ac", // HPE Primera 3PAR
61-
"24a937" // Pure Flasharray
61+
"24a937" // Pure Storage FlashArray
6262
};
6363

6464
/**

‎plugins/storage/volume/flasharray/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2121
<modelVersion>4.0.0</modelVersion>
2222
<artifactId>cloud-plugin-storage-volume-flasharray</artifactId>
23-
<name>Apache CloudStack Plugin - Storage Volume - Pure Flash Array</name>
23+
<name>Apache CloudStack Plugin - Storage Volume - Pure Storage FlashArray</name>
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack-plugins</artifactId>

‎plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public ProviderVolume getVolume(ProviderAdapterContext context, ProviderAdapterD
328328

329329
return volume;
330330
} catch (Exception e) {
331-
// assume any exception is a not found. Flash returns 400's for most errors
331+
// assume any exception is a not found. FlashArray returns 400's for most errors
332332
return null;
333333
}
334334
}
@@ -391,7 +391,7 @@ public ProviderVolume getVolumeByAddress(ProviderAdapterContext context, Address
391391

392392
return volume;
393393
} catch (Exception e) {
394-
// assume any exception is a not found. Flash returns 400's for most errors
394+
// assume any exception is a not found. FlashArray returns 400's for most errors
395395
return null;
396396
}
397397
}
@@ -451,7 +451,7 @@ public ProviderVolume revert(ProviderAdapterContext context, ProviderAdapterData
451451
String origVolumeName = snapshot.getSource().getName();
452452

453453
// now "create" a new volume with the snapshot volume as its source (basically a
454-
// Flash array copy)
454+
// FlashArray copy)
455455
// and overwrite to true (volume already exists, we are recreating it)
456456
FlashArrayVolume input = new FlashArrayVolume();
457457
input.setExternalName(origVolumeName);
@@ -509,7 +509,7 @@ public ProviderVolume copy(ProviderAdapterContext context, ProviderAdapterDataOb
509509
}
510510

511511
// now "create" a new volume with the snapshot volume as its source (basically a
512-
// Flash array copy)
512+
// FlashArray copy)
513513
// and overwrite to true (volume already exists, we are recreating it)
514514
FlashArrayVolume payload = new FlashArrayVolume();
515515
payload.setExternalName(normalizeName(pod, destDataObject.getExternalName()));

‎plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapterFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class FlashArrayAdapterFactory implements ProviderAdapterFactory {
2525

2626
@Override
2727
public String getProviderName() {
28-
return "Flash Array";
28+
return "FlashArray";
2929
}
3030

3131
@Override

‎plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/provider/FlashArrayPrimaryDatastoreProviderImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public FlashArrayPrimaryDatastoreProviderImpl() {
2626

2727
@Override
2828
public String getName() {
29-
return "Flash Array";
29+
return "FlashArray";
3030
}
3131

3232
}

‎ui/public/locales/el_GR.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2087,7 +2087,7 @@
20872087
"label.primera.username.tooltip": "Το όνομα χρήστη με δικαιώματα επεξεργασίας",
20882088
"label.primera.url.tooltip": "URL που ορίζει το τελικό σημείο της συστοιχίας αποθήκευσης Primera, με μορφή: http[s]://HOSTNAME:PORT?cpg=NAME&hostset=NAME[&skipTlsValidation=true][&snapCPG=NAME][&taskWaitTimeoutMs=#][&keyttl=#][&connectTimeoutMs=#] όπου οι τιμές σε [] είναι προαιρετικές.",
20892089
"label.flashArray.username.tooltip": "Το όνομα χρήστη με δικαιώματα επεξεργασίας",
2090-
"label.flashArray.url.tooltip": "URL που ορίζει το τελικό σημείο του Flash Array, με μορφή: http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#] όπου οι τιμές σε [] είναι προαιρετικές.",
2090+
"label.flashArray.url.tooltip": "URL που ορίζει το τελικό σημείο του FlashArray, με μορφή: http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#] όπου οι τιμές σε [] είναι προαιρετικές.",
20912091
"label.primary": "Πρωτεύουσα",
20922092
"label.primary.storage": "Πρωτεύουσα αποθήκευση",
20932093
"label.primary.storage.allocated": "Εκχωρημένη πρωτεύουσα αποθήκευση",

‎ui/public/locales/en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2102,7 +2102,7 @@
21022102
"label.primera.username.tooltip": "The username with edit privileges",
21032103
"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.",
21042104
"label.flashArray.username.tooltip": "The username with edit privileges",
2105-
"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.",
2105+
"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.",
21062106
"label.primary": "Primary",
21072107
"label.primary.storage": "Primary Storage",
21082108
"label.primary.storage.allocated": "Primary Storage allocated",

‎ui/public/locales/pt_BR.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1783,7 +1783,7 @@
17831783
"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.",
17841784
"label.primera.username.tooltip": "O nome de usu\u00e1rio com privil\u00e9gios de edi\u00e7\u00e3o",
17851785
"label.flashArray.username.tooltip": "O nome de us\u00e1rio com privil\u00e9gios de edi\u00e7\u00e3o",
1786-
"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.",
1786+
"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.",
17871787
"label.primary": "Prim\u00e1rio",
17881788
"label.primary.storage": "Armazenamento prim\u00e1rio",
17891789
"label.primary.storage.allocated": "Armazenamento prim\u00e1rio alocado",

‎ui/public/locales/te.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,7 @@
17181718
"label.primera.username.tooltip": "సవరణ అధికారాలతో వినియోగదారు పేరు",
17191719
"label.primera.url.tooltip": "ప్రైమెరా స్టోరేజ్ అర్రే ఎండ్‌పాయింట్‌ని నిర్దేశించే URL, ఇలా ఫార్మాట్ చేయబడింది: http[s]://HOSTNAME:PORT?cpg=NAME&hostset=NAME[&skipTlsValidation=true][&snapCPG=NAME][&taskWaitTimeoutMs=#][&keyttl=#][&connectTimeoutMs= ",
17201720
"label.flashArray.username.tooltip": "సవరణ అధికారాలతో వినియోగదారు పేరు",
1721-
"label.flashArray.url.tooltip": "Flash Array ముగింపు బిందువును నిర్దేశించే URL, ఇలా ఫార్మాట్ చేయబడింది: http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVers ",
1721+
"label.flashArray.url.tooltip": "FlashArray ముగింపు బిందువును నిర్దేశించే URL, ఇలా ఫార్మాట్ చేయబడింది: http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVers ",
17221722
"label.primary": "ప్రాథమిక",
17231723
"label.primary.storage": "ప్రాథమిక నిల్వ",
17241724
"label.primary.storage.allocated": "ప్రాథమిక నిల్వ కేటాయించబడింది",

0 commit comments

Comments
 (0)