Skip to content

Minor fixes for references to Pure Storage FlashArray #10271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
};

/**
2 changes: 1 addition & 1 deletion plugins/storage/volume/flasharray/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -248,7 +248,7 @@ public ProviderVolume getVolume(ProviderAdapterContext context, ProviderAdapterD

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;
}
}
@@ -266,7 +266,7 @@ public ProviderVolume getVolumeByAddress(ProviderAdapterContext context, Address
"Invalid volume address type [" + addressType + "] requested for volume search");
}

// convert WWN to serial to search on. strip out WWN type # + Flash OUI value
// convert WWN to serial to search on. strip out WWN type # + FlashArray OUI value
String serial = address.substring(FlashArrayVolume.PURE_OUI.length() + 1).toUpperCase();
String query = "serial='" + serial + "'";

@@ -288,7 +288,7 @@ public ProviderVolume getVolumeByAddress(ProviderAdapterContext context, Address

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;
}
}
@@ -345,7 +345,7 @@ public ProviderVolume revert(ProviderAdapterContext context, ProviderAdapterData
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);
@@ -400,7 +400,7 @@ public ProviderVolume copy(ProviderAdapterContext context, ProviderAdapterDataOb
}

// 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()));
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@

@Override
public String getProviderName() {
return "Flash Array";
return "FlashArray";
}

Check warning on line 29 in plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapterFactory.java

Codecov / codecov/patch

plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapterFactory.java#L28-L29

Added lines #L28 - L29 were not covered by tests

@Override
public ProviderAdapter create(String url, Map<String, String> details) {
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ public FlashArrayPrimaryDatastoreProviderImpl() {

@Override
public String getName() {
return "Flash Array";
return "FlashArray";
}

}
2 changes: 1 addition & 1 deletion tools/ngui/static/js/lib/jquery-1.7.2.js
Original file line number Diff line number Diff line change
@@ -1680,7 +1680,7 @@ jQuery.extend({
// attempt to add expando properties to them.
noData: {
"embed": true,
// Ban all objects except for Flash (which handle expandos)
// Ban all objects except for FlashArray (which handle expandos)
"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
"applet": true
},
2 changes: 1 addition & 1 deletion ui/public/locales/en.json
Original file line number Diff line number Diff line change
@@ -1730,7 +1730,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",
2 changes: 1 addition & 1 deletion ui/public/locales/te.json
Original file line number Diff line number Diff line change
@@ -1714,7 +1714,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": "ప్రాథమిక నిల్వ కేటాయించబడింది",
6 changes: 3 additions & 3 deletions ui/src/views/infra/AddPrimaryStorage.vue
Original file line number Diff line number Diff line change
@@ -328,7 +328,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')"/>
@@ -755,7 +755,7 @@ export default {
if (value === 'PowerFlex') {
this.protocols = ['custom']
this.form.protocol = 'custom'
} else if (value === 'Flash Array' || value === 'Primera') {
} else if (value === 'FlashArray' || value === 'Primera') {
this.protocols = ['FiberChannel']
this.form.protocol = 'FiberChannel'
} else {
@@ -873,7 +873,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