rename UserVMDetails to VMInstanceDetails

Author: abh1sar

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9544,12 +9544,12 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
         String vmSettingsFromBackup = backup.getDetail(ApiConstants.VM_SETTINGS);
         if (vm != null && vmSettingsFromBackup != null) {
             UserVmVO vmVO = _vmDao.findById(vm.getId());
-            Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vm.getId());
+            Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
             vmVO.setDetails(details);
 
             Type type = new TypeToken<Map<String, String>>(){}.getType();
             Map<String, String> vmDetailsFromBackup = new Gson().fromJson(vmSettingsFromBackup, type);
-            for (Map.Entry<String, String> entry : vmDetailsFromBackup.entrySet()) {
+            for (Entry<String, String> entry : vmDetailsFromBackup.entrySet()) {
                 if (!details.containsKey(entry.getKey())) {
                     vmVO.setDetail(entry.getKey(), entry.getValue());
                 }

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -57,7 +57,7 @@
 import com.cloud.user.DomainManager;
 import com.cloud.user.ResourceLimitService;
 import com.cloud.utils.fsm.NoTransitionException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VmDiskInfo;
 import javax.inject.Inject;
@@ -153,7 +153,7 @@
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -197,7 +197,7 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
     @Inject
     private UserVmJoinDao userVmJoinDao;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private NetworkDao networkDao;
     @Inject
@@ -340,9 +340,9 @@ public Map<String, String> getBackupDetailsFromVM(VirtualMachine vm) {
         VirtualMachineTemplate template = vmTemplateDao.findById(vm.getTemplateId());
         details.put(ApiConstants.TEMPLATE_ID, template.getUuid());
 
-        List<UserVmDetailVO> vmDetails = userVmDetailsDao.listDetails(vm.getId());
+        List<VMInstanceDetailVO> vmDetails = vmInstanceDetailsDao.listDetails(vm.getId());
         HashMap<String, String> settings = new HashMap<>();
-        for (UserVmDetailVO detail : vmDetails) {
+        for (VMInstanceDetailVO detail : vmDetails) {
             settings.put(detail.getName(), detail.getValue());
         }
         if (!settings.isEmpty()) {

server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java

@@ -58,12 +58,12 @@
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.NoTransitionException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VmDiskInfo;
 import com.cloud.vm.VirtualMachineManager;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 import org.apache.cloudstack.api.ApiConstants;
@@ -201,7 +201,7 @@ public class BackupManagerTest {
     private NetworkService networkService;
 
     @Mock
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
 
     private AccountVO account;
     private UserVO user;
@@ -932,11 +932,11 @@ public void testGetBackupDetailsFromVM() {
         when(template.getUuid()).thenReturn("template-uuid");
         when(vmTemplateDao.findById(2L)).thenReturn(template);
 
-        UserVmDetailVO userVmDetail = mock(UserVmDetailVO.class);
-        when(userVmDetail.getName()).thenReturn("mocked-detail-name");
-        when(userVmDetail.getValue()).thenReturn("mocked-detail-value");
-        List<UserVmDetailVO> vmDetails = Collections.singletonList(userVmDetail);
-        when(userVmDetailsDao.listDetails(vmId)).thenReturn(vmDetails);
+        VMInstanceDetailVO vmInstanceDetail = mock(VMInstanceDetailVO.class);
+        when(vmInstanceDetail.getName()).thenReturn("mocked-detail-name");
+        when(vmInstanceDetail.getValue()).thenReturn("mocked-detail-value");
+        List<VMInstanceDetailVO> vmDetails = Collections.singletonList(vmInstanceDetail);
+        when(vmInstanceDetailsDao.listDetails(vmId)).thenReturn(vmDetails);
 
         UserVmJoinVO userVmJoinVO = mock(UserVmJoinVO.class);
         when(userVmJoinVO.getNetworkUuid()).thenReturn("mocked-network-uuid");