Minor fixes for references to Pure Storage FlashArray

Author: sdodsley

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
     };
 
     /**

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>

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()));

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

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";
     }
 
 }

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
 	},

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",

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": "ప్రాథమిక నిల్వ కేటాయించబడింది",

ui/src/views/infra/AddPrimaryStorage.vue

@@ -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