@@ -133,9 +133,9 @@ public DataStoreTO getStoreTO(DataStore store) {
133133 }
134134
135135 private SolidFireUtil .SolidFireAccount createSolidFireAccount (SolidFireUtil .SolidFireConnection sfConnection , String sfAccountName ) {
136- long accountNumber = SolidFireUtil .createSolidFireAccount (sfConnection , sfAccountName );
136+ long accountNumber = SolidFireUtil .createAccount (sfConnection , sfAccountName );
137137
138- return SolidFireUtil .getSolidFireAccountById (sfConnection , accountNumber );
138+ return SolidFireUtil .getAccountById (sfConnection , accountNumber );
139139 }
140140
141141 @ Override
@@ -189,11 +189,11 @@ public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore
189189 SolidFireUtil .SolidFireConnection sfConnection = SolidFireUtil .getSolidFireConnection (storagePoolId , storagePoolDetailsDao );
190190
191191 if (vagId != null ) {
192- SolidFireUtil .SolidFireVag sfVag = SolidFireUtil .getSolidFireVag (sfConnection , Long .parseLong (vagId ));
192+ SolidFireUtil .SolidFireVag sfVag = SolidFireUtil .getVag (sfConnection , Long .parseLong (vagId ));
193193
194194 long [] volumeIds = SolidFireUtil .getNewVolumeIds (sfVag .getVolumeIds (), sfVolumeId , true );
195195
196- SolidFireUtil .modifySolidFireVag (sfConnection , sfVag .getId (), sfVag .getInitiators (), volumeIds );
196+ SolidFireUtil .modifyVag (sfConnection , sfVag .getId (), sfVag .getInitiators (), volumeIds );
197197 }
198198 else {
199199 SolidFireUtil .placeVolumeInVolumeAccessGroup (sfConnection , sfVolumeId , storagePoolId , cluster .getUuid (), hosts , clusterDetailsDao );
@@ -241,11 +241,11 @@ public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore)
241241 if (vagId != null ) {
242242 SolidFireUtil .SolidFireConnection sfConnection = SolidFireUtil .getSolidFireConnection (storagePoolId , storagePoolDetailsDao );
243243
244- SolidFireUtil .SolidFireVag sfVag = SolidFireUtil .getSolidFireVag (sfConnection , Long .parseLong (vagId ));
244+ SolidFireUtil .SolidFireVag sfVag = SolidFireUtil .getVag (sfConnection , Long .parseLong (vagId ));
245245
246246 long [] volumeIds = SolidFireUtil .getNewVolumeIds (sfVag .getVolumeIds (), sfVolumeId , false );
247247
248- SolidFireUtil .modifySolidFireVag (sfConnection , sfVag .getId (), sfVag .getInitiators (), volumeIds );
248+ SolidFireUtil .modifyVag (sfConnection , sfVag .getId (), sfVag .getInitiators (), volumeIds );
249249 }
250250 }
251251 finally {
@@ -370,10 +370,10 @@ private SolidFireUtil.SolidFireVolume createSolidFireVolume(SolidFireUtil.SolidF
370370
371371 final Iops iops = getIops (minIops , maxIops , storagePoolId );
372372
373- long sfVolumeId = SolidFireUtil .createSolidFireVolume (sfConnection , SolidFireUtil .getSolidFireVolumeName (volumeName ), sfAccountId ,
373+ long sfVolumeId = SolidFireUtil .createVolume (sfConnection , SolidFireUtil .getSolidFireVolumeName (volumeName ), sfAccountId ,
374374 volumeSize , true , mapAttributes , iops .getMinIops (), iops .getMaxIops (), iops .getBurstIops ());
375375
376- return SolidFireUtil .getSolidFireVolume (sfConnection , sfVolumeId );
376+ return SolidFireUtil .getVolume (sfConnection , sfVolumeId );
377377 }
378378
379379 private Iops getIops (Long minIops , Long maxIops , long storagePoolId ) {
@@ -415,7 +415,7 @@ private long getUsedBytes(StoragePool storagePool, long volumeIdToIgnore) {
415415 try {
416416 long lVolumeId = Long .parseLong (volume .getFolder ());
417417
418- SolidFireUtil .SolidFireVolume sfVolume = SolidFireUtil .getSolidFireVolume (sfConnection , lVolumeId );
418+ SolidFireUtil .SolidFireVolume sfVolume = SolidFireUtil .getVolume (sfConnection , lVolumeId );
419419
420420 long volumeSize = sfVolume .getTotalSize ();
421421
@@ -623,7 +623,7 @@ private long getCreateSolidFireAccountId(SolidFireUtil.SolidFireConnection sfCon
623623 if (accountDetail == null || accountDetail .getValue () == null ) {
624624 AccountVO account = accountDao .findById (csAccountId );
625625 String sfAccountName = SolidFireUtil .getSolidFireAccountName (account .getUuid (), account .getAccountId ());
626- SolidFireUtil .SolidFireAccount sfAccount = SolidFireUtil .getSolidFireAccount (sfConnection , sfAccountName );
626+ SolidFireUtil .SolidFireAccount sfAccount = SolidFireUtil .getAccount (sfConnection , sfAccountName );
627627
628628 if (sfAccount == null ) {
629629 sfAccount = createSolidFireAccount (sfConnection , sfAccountName );
@@ -775,14 +775,14 @@ private SolidFireUtil.SolidFireVolume createClone(SolidFireUtil.SolidFireConnect
775775 " and data-object type: " + dataObjectType );
776776 }
777777
778- final long newSfVolumeId = SolidFireUtil .createSolidFireClone (sfConnection , sfVolumeId , sfSnapshotId , sfAccountId , sfNewVolumeName ,
778+ final long newSfVolumeId = SolidFireUtil .createClone (sfConnection , sfVolumeId , sfSnapshotId , sfAccountId , sfNewVolumeName ,
779779 getVolumeAttributes (volumeInfo ));
780780
781781 final Iops iops = getIops (volumeInfo .getMinIops (), volumeInfo .getMaxIops (), storagePoolId );
782782
783- SolidFireUtil .modifySolidFireVolume (sfConnection , newSfVolumeId , null , null , iops .getMinIops (), iops .getMaxIops (), iops .getBurstIops ());
783+ SolidFireUtil .modifyVolume (sfConnection , newSfVolumeId , null , null , iops .getMinIops (), iops .getMaxIops (), iops .getBurstIops ());
784784
785- return SolidFireUtil .getSolidFireVolume (sfConnection , newSfVolumeId );
785+ return SolidFireUtil .getVolume (sfConnection , newSfVolumeId );
786786 }
787787
788788 private Map <String , String > getVolumeAttributes (VolumeInfo volumeInfo ) {
@@ -821,19 +821,19 @@ private SolidFireUtil.SolidFireVolume createCloneFromSnapshot(SolidFireUtil.Soli
821821
822822 long sfSnapshotId = Long .parseLong (snapshotDetails .getValue ());
823823
824- SolidFireUtil .SolidFireSnapshot sfSnapshot = SolidFireUtil .getSolidFireSnapshot (sfConnection , sfVolumeId , sfSnapshotId );
824+ SolidFireUtil .SolidFireSnapshot sfSnapshot = SolidFireUtil .getSnapshot (sfConnection , sfVolumeId , sfSnapshotId );
825825
826- long newSfVolumeId = SolidFireUtil .createSolidFireClone (sfConnection , sfVolumeId , sfSnapshotId , sfAccountId , sfSnapshot .getName (), null );
826+ long newSfVolumeId = SolidFireUtil .createClone (sfConnection , sfVolumeId , sfSnapshotId , sfAccountId , sfSnapshot .getName (), null );
827827
828828 snapshotDetails = snapshotDetailsDao .findDetail (csSnapshotId , SolidFireUtil .STORAGE_POOL_ID );
829829
830830 long storagePoolId = Long .parseLong (snapshotDetails .getValue ());
831831
832832 final Iops iops = getIops (MIN_IOPS_FOR_TEMP_VOLUME , MAX_IOPS_FOR_TEMP_VOLUME , storagePoolId );
833833
834- SolidFireUtil .modifySolidFireVolume (sfConnection , newSfVolumeId , null , null , iops .getMinIops (), iops .getMaxIops (), iops .getBurstIops ());
834+ SolidFireUtil .modifyVolume (sfConnection , newSfVolumeId , null , null , iops .getMinIops (), iops .getMaxIops (), iops .getBurstIops ());
835835
836- return SolidFireUtil .getSolidFireVolume (sfConnection , newSfVolumeId );
836+ return SolidFireUtil .getVolume (sfConnection , newSfVolumeId );
837837 }
838838
839839 private void updateVolumeDetails (long volumeId , long sfVolumeSize ) {
@@ -897,7 +897,7 @@ public void takeSnapshot(SnapshotInfo snapshotInfo, AsyncCompletionCallback<Crea
897897
898898 SolidFireUtil .SolidFireConnection sfConnection = SolidFireUtil .getSolidFireConnection (storagePoolId , storagePoolDetailsDao );
899899
900- SolidFireUtil .SolidFireVolume sfVolume = SolidFireUtil .getSolidFireVolume (sfConnection , sfVolumeId );
900+ SolidFireUtil .SolidFireVolume sfVolume = SolidFireUtil .getVolume (sfConnection , sfVolumeId );
901901
902902 StoragePoolVO storagePool = storagePoolDao .findById (storagePoolId );
903903
@@ -925,7 +925,7 @@ public void takeSnapshot(SnapshotInfo snapshotInfo, AsyncCompletionCallback<Crea
925925
926926 String sfNewSnapshotName = volumeInfo .getName () + "-" + snapshotInfo .getUuid ();
927927
928- long sfNewSnapshotId = SolidFireUtil .createSolidFireSnapshot (sfConnection , sfVolumeId , sfNewSnapshotName , getSnapshotAttributes (snapshotInfo ));
928+ long sfNewSnapshotId = SolidFireUtil .createSnapshot (sfConnection , sfVolumeId , sfNewSnapshotName , getSnapshotAttributes (snapshotInfo ));
929929
930930 updateSnapshotDetails (snapshotInfo .getId (), sfVolumeId , sfNewSnapshotId , storagePoolId , sfVolumeSize );
931931
@@ -938,10 +938,10 @@ public void takeSnapshot(SnapshotInfo snapshotInfo, AsyncCompletionCallback<Crea
938938
939939 final Iops iops = getIops (MIN_IOPS_FOR_SNAPSHOT_VOLUME , MAX_IOPS_FOR_SNAPSHOT_VOLUME , storagePoolId );
940940
941- long sfNewVolumeId = SolidFireUtil .createSolidFireVolume (sfConnection , sfNewVolumeName , sfVolume .getAccountId (), sfVolumeSize ,
941+ long sfNewVolumeId = SolidFireUtil .createVolume (sfConnection , sfNewVolumeName , sfVolume .getAccountId (), sfVolumeSize ,
942942 sfVolume .isEnable512e (), getSnapshotAttributes (snapshotInfo ), iops .getMinIops (), iops .getMaxIops (), iops .getBurstIops ());
943943
944- SolidFireUtil .SolidFireVolume sfNewVolume = SolidFireUtil .getSolidFireVolume (sfConnection , sfNewVolumeId );
944+ SolidFireUtil .SolidFireVolume sfNewVolume = SolidFireUtil .getVolume (sfConnection , sfNewVolumeId );
945945
946946 updateSnapshotDetails (snapshotInfo .getId (), sfNewVolumeId , storagePoolId , sfVolumeSize , sfNewVolume .getIqn ());
947947
@@ -1077,11 +1077,11 @@ private String createVolume(VolumeInfo volumeInfo, long storagePoolId) {
10771077
10781078 if (volumeSize > sfVolume .getTotalSize ()) {
10791079 // Expand the volume to include HSR.
1080- SolidFireUtil .modifySolidFireVolume (sfConnection , sfVolume .getId (), volumeSize , getVolumeAttributes (volumeInfo ),
1080+ SolidFireUtil .modifyVolume (sfConnection , sfVolume .getId (), volumeSize , getVolumeAttributes (volumeInfo ),
10811081 sfVolume .getMinIops (), sfVolume .getMaxIops (), sfVolume .getBurstIops ());
10821082
10831083 // Get the SolidFire volume from the SAN again because we just updated its size.
1084- sfVolume = SolidFireUtil .getSolidFireVolume (sfConnection , sfVolume .getId ());
1084+ sfVolume = SolidFireUtil .getVolume (sfConnection , sfVolume .getId ());
10851085 }
10861086 }
10871087 else {
@@ -1140,7 +1140,7 @@ private void createTempVolume(SnapshotInfo snapshotInfo, long storagePoolId) {
11401140 else if (snapshotDetails != null && snapshotDetails .getValue () != null && snapshotDetails .getValue ().equalsIgnoreCase ("delete" )) {
11411141 snapshotDetails = snapshotDetailsDao .findDetail (csSnapshotId , SolidFireUtil .VOLUME_ID );
11421142
1143- SolidFireUtil .deleteSolidFireVolume (sfConnection , Long .parseLong (snapshotDetails .getValue ()));
1143+ SolidFireUtil .deleteVolume (sfConnection , Long .parseLong (snapshotDetails .getValue ()));
11441144
11451145 removeTempVolumeId (csSnapshotId );
11461146
@@ -1197,7 +1197,7 @@ private void performBasicDelete(SolidFireUtil.SolidFireConnection sfConnection,
11971197
11981198 VolumeVO volumeVO = volumeDao .findById (volumeId );
11991199
1200- SolidFireUtil .deleteSolidFireVolume (sfConnection , Long .parseLong (volumeVO .getFolder ()));
1200+ SolidFireUtil .deleteVolume (sfConnection , Long .parseLong (volumeVO .getFolder ()));
12011201
12021202 volumeVO .setFolder (String .valueOf (sfVolumeId ));
12031203 volumeVO .set_iScsiName (iqn );
@@ -1214,7 +1214,7 @@ private void performBasicDeleteFailure(SolidFireUtil.SolidFireConnection sfConne
12141214
12151215 Preconditions .checkNotNull (sfVolumeId , "'sfVolumeId' should not be 'null'." );
12161216
1217- SolidFireUtil .deleteSolidFireVolume (sfConnection , sfVolumeId );
1217+ SolidFireUtil .deleteVolume (sfConnection , sfVolumeId );
12181218
12191219 volumeDetailsDao .removeDetail (volumeId , BASIC_SF_ID );
12201220 volumeDetailsDao .removeDetail (volumeId , BASIC_IQN );
@@ -1276,7 +1276,7 @@ private void deleteSnapshot(SnapshotInfo snapshotInfo, long storagePoolId) {
12761276
12771277 long sfVolumeId = Long .parseLong (snapshotDetails .getValue ());
12781278
1279- SolidFireUtil .deleteSolidFireVolume (sfConnection , sfVolumeId );
1279+ SolidFireUtil .deleteVolume (sfConnection , sfVolumeId );
12801280 }
12811281
12821282 snapshotDetailsDao .removeDetails (csSnapshotId );
@@ -1303,7 +1303,7 @@ private void deleteTemplate(TemplateInfo template, long storagePoolId) {
13031303
13041304 long sfTemplateVolumeId = getVolumeIdFrom_iScsiPath (template .getInstallPath ());
13051305
1306- SolidFireUtil .deleteSolidFireVolume (sfConnection , sfTemplateVolumeId );
1306+ SolidFireUtil .deleteVolume (sfConnection , sfTemplateVolumeId );
13071307
13081308 VMTemplateStoragePoolVO templatePoolRef = tmpltPoolDao .findByPoolTemplate (storagePoolId , template .getId ());
13091309
@@ -1343,7 +1343,7 @@ public void resize(DataObject dataObject, AsyncCompletionCallback<CreateCmdResul
13431343 ResizeVolumePayload payload = (ResizeVolumePayload )volumeInfo .getpayload ();
13441344
13451345 SolidFireUtil .SolidFireConnection sfConnection = SolidFireUtil .getSolidFireConnection (storagePoolId , storagePoolDetailsDao );
1346- SolidFireUtil .SolidFireVolume sfVolume = SolidFireUtil .getSolidFireVolume (sfConnection , sfVolumeId );
1346+ SolidFireUtil .SolidFireVolume sfVolume = SolidFireUtil .getVolume (sfConnection , sfVolumeId );
13471347
13481348 verifySufficientIopsForStoragePool (storagePoolId , volumeInfo .getId (), payload .newMinIops );
13491349 verifySufficientBytesForStoragePool (storagePoolId , volumeInfo .getId (), payload .newSize , payload .newHypervisorSnapshotReserve );
@@ -1372,7 +1372,7 @@ public void resize(DataObject dataObject, AsyncCompletionCallback<CreateCmdResul
13721372 mapAttributes .put (SolidFireUtil .CloudStackVolumeId , String .valueOf (volumeInfo .getId ()));
13731373 mapAttributes .put (SolidFireUtil .CloudStackVolumeSize , NumberFormat .getInstance ().format (payload .newSize ));
13741374
1375- SolidFireUtil .modifySolidFireVolume (sfConnection , sfVolumeId , sfNewVolumeSize , mapAttributes ,
1375+ SolidFireUtil .modifyVolume (sfConnection , sfVolumeId , sfNewVolumeSize , mapAttributes ,
13761376 payload .newMinIops , payload .newMaxIops , getDefaultBurstIops (storagePoolId , payload .newMaxIops ));
13771377
13781378 VolumeVO volume = volumeDao .findById (volumeInfo .getId ());
@@ -1478,12 +1478,12 @@ private void deleteSolidFireVolume(SolidFireUtil.SolidFireConnection sfConnectio
14781478 }
14791479
14801480 if (deleteVolume ) {
1481- SolidFireUtil .deleteSolidFireVolume (sfConnection , sfVolumeId );
1481+ SolidFireUtil .deleteVolume (sfConnection , sfVolumeId );
14821482 }
14831483 }
14841484
14851485 private void deleteSolidFireSnapshot (SolidFireUtil .SolidFireConnection sfConnection , long csSnapshotId , long sfSnapshotId ) {
1486- SolidFireUtil .deleteSolidFireSnapshot (sfConnection , sfSnapshotId );
1486+ SolidFireUtil .deleteSnapshot (sfConnection , sfSnapshotId );
14871487
14881488 SnapshotVO snapshot = snapshotDao .findById (csSnapshotId );
14891489 VolumeVO volume = volumeDao .findById (snapshot .getVolumeId ());
@@ -1510,7 +1510,7 @@ private void deleteSolidFireSnapshot(SolidFireUtil.SolidFireConnection sfConnect
15101510 if (lstSnapshots2 .isEmpty ()) {
15111511 volume = volumeDao .findByIdIncludingRemoved (snapshot .getVolumeId ());
15121512
1513- SolidFireUtil .deleteSolidFireVolume (sfConnection , Long .parseLong (volume .getFolder ()));
1513+ SolidFireUtil .deleteVolume (sfConnection , Long .parseLong (volume .getFolder ()));
15141514 }
15151515 }
15161516 }
0 commit comments