apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

=CLOUDSTACK-4068 scaling up user vm and system vm is failing with NPE if current service offering is deleted

Browse Source 
Nitin Mehta <nitin.mehta@citrix.com>
This commit is contained in:
Bharat Kumar 2013-08-16 17:26:57 +05:30 committed by Nitin Mehta
parent 3f79a6730f
commit 15c93ba9b7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1237,7 +1237,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
//Check if its a scale "up"
ServiceOffering newServiceOffering = _configMgr.getServiceOffering(newServiceOfferingId);
ServiceOffering currentServiceOffering = _configMgr.getServiceOffering(vmInstance.getServiceOfferingId());
ServiceOffering currentServiceOffering = _offeringDao.findByIdIncludingRemoved(vmInstance.getServiceOfferingId());
int newCpu = newServiceOffering.getCpu();
int newMemory = newServiceOffering.getRamSize();
int newSpeed = newServiceOffering.getSpeed();

5
server/test/com/cloud/vm/UserVmManagerTest.java
View File

@ -35,6 +35,7 @@ import java.lang.reflect.Field;
import java.util.List;
import java.util.UUID;
import com.cloud.service.dao.ServiceOfferingDao;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
@ -107,6 +108,7 @@ public class UserVmManagerTest {
@Mock VolumeVO _volumeMock;
@Mock List<VolumeVO> _rootVols;
@Mock Account _accountMock2;
@Mock ServiceOfferingDao _offeringDao;
@Before
public void setup(){
MockitoAnnotations.initMocks(this);
@ -122,6 +124,7 @@ public class UserVmManagerTest {
_userVmMgr._userDao = _userDao;
_userVmMgr._accountMgr = _accountMgr;
_userVmMgr._configMgr = _configMgr;
_userVmMgr._offeringDao= _offeringDao;
_userVmMgr._capacityMgr = _capacityMgr;
_userVmMgr._scaleRetry = 2;
@ -356,7 +359,7 @@ public class UserVmManagerTest {
ServiceOffering so2 = getSvcoffering(256);
when(_configMgr.getServiceOffering(anyLong())).thenReturn(so1);
when(_configMgr.getServiceOffering(1L)).thenReturn(so1);
when(_offeringDao.findByIdIncludingRemoved(anyLong())).thenReturn((ServiceOfferingVO) so1);
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, UUID.randomUUID().toString());
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString());