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 0cf8ce0018d3..01ddbc87f706 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 ac247f43f927..5f9db6b31e11 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"> 4.0.0 cloud-plugin-storage-volume-flasharray - Apache CloudStack Plugin - Storage Volume - Pure Flash Array + Apache CloudStack Plugin - Storage Volume - Pure Storage FlashArray org.apache.cloudstack cloudstack-plugins 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 715379daf86d..9d0767f5257c 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 @@ -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())); 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 de55b27884eb..c0edcfe08e19 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 0750ef2cc27d..e76d5b3e7f61 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 FlashArrayPrimaryDatastoreProviderImpl() { @Override public String getName() { - return "Flash Array"; + return "FlashArray"; } } diff --git a/tools/ngui/static/js/lib/jquery-1.7.2.js b/tools/ngui/static/js/lib/jquery-1.7.2.js index 0226b700644f..ed502988d1d6 100644 --- a/tools/ngui/static/js/lib/jquery-1.7.2.js +++ b/tools/ngui/static/js/lib/jquery-1.7.2.js @@ -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 }, diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 820f08b8cb4f..d5393b44c765 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -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", diff --git a/ui/public/locales/te.json b/ui/public/locales/te.json index c6c49529054d..a902e86ff75c 100644 --- a/ui/public/locales/te.json +++ b/ui/public/locales/te.json @@ -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": "ప్రాథమిక నిల్వ కేటాయించబడింది", diff --git a/ui/src/views/infra/AddPrimaryStorage.vue b/ui/src/views/infra/AddPrimaryStorage.vue index 1420d7b6ff1b..57262b88975b 100644 --- a/ui/src/views/infra/AddPrimaryStorage.vue +++ b/ui/src/views/infra/AddPrimaryStorage.vue @@ -328,7 +328,7 @@ -
+