etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-27 12:07:26 -07:00
parent 03098ec890 a29b897b7f
commit 6994fbfb7a
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)
*/
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;
}
@Override
public void setRamSize(int ramSize) {
this.ramSize = ramSize;
}
@Override
public String getGateway() {
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());
}
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) {
@ -926,6 +925,9 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach
router.setPrivateNetmask(privateNetMask);
router.setGuestMacAddress(routerMacAddress);
router.setVnet(vnet);
/*Ram size can be changed by upgradeRouterCmd*/
router.setRamSize(offering.getRamSize());
final String name = VirtualMachineName.attachVnet(router.getName(), vnet);
router.setInstanceName(name);
long accountId = router.getAccountId();