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

bug 1974: set memory size from service offering before starting router

Browse Source 
status 1974: resolved fixed
This commit is contained in:
edison 2010-10-27 11:59:05 -07:00
parent 25071e0212
commit a29b897b7f
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/vm/DomainRouter.java
View File

@ -84,4 +84,6 @@ public interface DomainRouter extends VirtualMachine {
* @return the range of dhcp addresses served (start and end) * @return the range of dhcp addresses served (start and end)
*/ */
String[] getDhcpRange(); String[] getDhcpRange();
void setRamSize(int ramSize);
} }

5
core/src/com/cloud/vm/DomainRouterVO.java
View File

@ -245,6 +245,11 @@ public class DomainRouterVO extends VMInstanceVO implements DomainRouter {
return ramSize; return ramSize;
} }
@Override
public void setRamSize(int ramSize) {
this.ramSize = ramSize;
}
@Override @Override
public String getGateway() { public String getGateway() {
return gateway; return gateway;

10
server/src/com/cloud/network/router/DomainRouterManagerImpl.java
View File

@ -691,10 +691,9 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach
"curruent local storage status: " + currentServiceOffering.getUseLocalStorage()); "curruent local storage status: " + currentServiceOffering.getUseLocalStorage());
} }
router = _routerDao.acquire(routerId); router.setServiceOfferingId(serviceOfferingId);
return _routerDao.update(routerId, router);
router.setServiceOfferingId(serviceOfferingId);
return _routerDao.update(routerId, router);
} }
private String rot13(final String password) { private String rot13(final String password) {
@ -926,6 +925,9 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach
router.setPrivateNetmask(privateNetMask); router.setPrivateNetmask(privateNetMask);
router.setGuestMacAddress(routerMacAddress); router.setGuestMacAddress(routerMacAddress);
router.setVnet(vnet); router.setVnet(vnet);
/*Ram size can be changed by upgradeRouterCmd*/
router.setRamSize(offering.getRamSize());
final String name = VirtualMachineName.attachVnet(router.getName(), vnet); final String name = VirtualMachineName.attachVnet(router.getName(), vnet);
router.setInstanceName(name); router.setInstanceName(name);
long accountId = router.getAccountId(); long accountId = router.getAccountId();