Revert sharedfsvm changes

Author: abh1sar

plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java

@@ -140,18 +140,13 @@ private String getStorageVmConfig(final String fileSystem, final String hypervis
         return fsVmConfig;
     }
 
-    private String getStorageVmPrefix(String fileShareName) {
+    private String getStorageVmName(String fileShareName) {
         String prefix = String.format("%s-%s", SharedFSVmNamePrefix, fileShareName);
+        String suffix = Long.toHexString(System.currentTimeMillis());
+
         if (!NetUtils.verifyDomainNameLabel(prefix, true)) {
             prefix = prefix.replaceAll("[^a-zA-Z0-9-]", "");
         }
-        return prefix;
-    }
-
-    private String getStorageVmName(String fileShareName) {
-        String prefix = getStorageVmPrefix(fileShareName);
-        String suffix = Long.toHexString(System.currentTimeMillis());
-
         int nameLength = prefix.length() + suffix.length() + SharedFSVmNamePrefix.length();
         if (nameLength > 63) {
             int prefixLength = prefix.length() - (nameLength - 63);
@@ -241,18 +236,8 @@ public Pair<Long, Long> deploySharedFS(SharedFS sharedFS, Long networkId, Long d
         Account owner = accountMgr.getActiveAccountById(sharedFS.getAccountId());
         UserVm vm = deploySharedFSVM(sharedFS.getDataCenterId(), owner, List.of(networkId), sharedFS.getName(), sharedFS.getServiceOfferingId(), diskOfferingId, sharedFS.getFsType(), size, minIops, maxIops);
 
-        List<VolumeVO> volumes = volumeDao.findByInstance(vm.getId());
-        VolumeVO dataVol = null;
-        for (VolumeVO vol : volumes) {
-            String volumeName = vol.getName();
-            String updatedVolumeName = SharedFSVmNamePrefix + "-" + volumeName;
-            vol.setName(updatedVolumeName);
-            volumeDao.update(vol.getId(), vol);
-            if (vol.getVolumeType() == Volume.Type.DATADISK) {
-                dataVol = vol;
-            }
-        }
-        return new Pair<>(dataVol.getId(), vm.getId());
+        List<VolumeVO> volumes = volumeDao.findByInstanceAndType(vm.getId(), Volume.Type.DATADISK);
+        return new Pair<>(volumes.get(0).getId(), vm.getId());
     }
 
     @Override

ui/src/components/view/InfoCard.vue

@@ -33,9 +33,6 @@
                 <span v-if="(resource.icon && resource.icon.base64image || images.template || images.iso || resourceIcon) && !['router', 'systemvm', 'volume'].includes($route.path.split('/')[1])">
                   <resource-icon :image="getImage(resource.icon && resource.icon.base64image || images.template || images.iso || resourceIcon)" size="4x" style="margin-right: 5px"/>
                 </span>
-                <span v-else-if="resource.vmtype === 'sharedfsvm'">
-                  <file-text-outlined style="font-size: 36px;" />
-                </span>
                 <span v-else>
                   <os-logo v-if="resource.ostypeid || resource.ostypename" :osId="resource.ostypeid" :osName="resource.ostypename" size="3x" @update-osname="setResourceOsType"/>
                   <render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 36px" :icon="$route.meta.icon" />
@@ -873,7 +870,6 @@ import UploadResourceIcon from '@/components/view/UploadResourceIcon'
 import eventBus from '@/config/eventBus'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import ResourceLabel from '@/components/widgets/ResourceLabel'
-import { FileTextOutlined } from '@ant-design/icons-vue'
 
 export default {
   name: 'InfoCard',
@@ -885,8 +881,7 @@ export default {
     TooltipButton,
     UploadResourceIcon,
     ResourceIcon,
-    ResourceLabel,
-    FileTextOutlined
+    ResourceLabel
   },
   props: {
     resource: {

ui/src/components/view/ListView.vue

@@ -44,9 +44,6 @@
           <span v-if="record.icon && record.icon.base64image">
             <resource-icon :image="record.icon.base64image" size="2x"/>
           </span>
-          <span v-else-if="record.vmtype === 'sharedfsvm'">
-            <file-text-outlined style="font-size: 24px;" />
-          </span>
           <os-logo v-else :osId="record.ostypeid" :osName="record.osdisplayname" size="xl" />
         </span>
         <span style="min-width: 120px" >
@@ -594,7 +591,6 @@ import { createPathBasedOnVmType } from '@/utils/plugins'
 import { validateLinks } from '@/utils/links'
 import cronstrue from 'cronstrue/i18n'
 import moment from 'moment-timezone'
-import { FileTextOutlined } from '@ant-design/icons-vue'
 
 export default {
   name: 'ListView',
@@ -605,8 +601,7 @@ export default {
     CopyLabel,
     TooltipButton,
     ResourceIcon,
-    ResourceLabel,
-    FileTextOutlined
+    ResourceLabel
   },
   props: {
     columns: {