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

missed one more file

This commit is contained in:
Alex Huang 2013-05-19 09:16:42 -07:00
parent 5145c3cbf1
commit f49257cce5
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
View File

@ -120,7 +120,7 @@ import com.cloud.vm.dao.NicDao;
@Component
@Local(value = { InternalLoadBalancerVMManager.class, InternalLoadBalancerVMService.class})
public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
InternalLoadBalancerVMManager, VirtualMachineGuru<DomainRouterVO> {
InternalLoadBalancerVMManager, VirtualMachineGuru {
private static final Logger s_logger = Logger
.getLogger(InternalLoadBalancerVMManagerImpl.class);
static final private String _internalLbVmNamePrefix = "b";
@ -150,25 +150,25 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
@Inject ResourceManager _resourceMgr;
@Inject ConfigurationServer _configServer;
@Override
public DomainRouterVO findByName(String name) {
if (!VirtualMachineName.isValidSystemVmName(name, _instance, _internalLbVmNamePrefix)) {
return null;
}
return _internalLbVmDao.findById(VirtualMachineName.getRouterId(name));
}
@Override
public DomainRouterVO findById(long id) {
return _internalLbVmDao.findById(id);
}
@Override
public DomainRouterVO persist(DomainRouterVO vm) {
DomainRouterVO virtualRouter = _internalLbVmDao.persist(vm);
return virtualRouter;
}
// @Override
// public DomainRouterVO findByName(String name) {
// if (!VirtualMachineName.isValidSystemVmName(name, _instance, _internalLbVmNamePrefix)) {
// return null;
// }
//
// return _internalLbVmDao.findById(VirtualMachineName.getRouterId(name));
// }
//
// @Override
// public DomainRouterVO findById(long id) {
// return _internalLbVmDao.findById(id);
// }
//
// @Override
// public DomainRouterVO persist(DomainRouterVO vm) {
// DomainRouterVO virtualRouter = _internalLbVmDao.persist(vm);
// return virtualRouter;
// }
@Override
public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile,
@ -312,7 +312,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
return result;
}
@Override
public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile profile) {
DomainRouterVO internalLbVm = _internalLbVmDao.findById(profile.getId());
NicProfile controlNic = getNicProfileByTrafficType(profile, TrafficType.Control);
@ -354,17 +354,17 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
}
@Override
public void finalizeExpunge(DomainRouterVO vm) {
public void finalizeExpunge(VirtualMachine vm) {
}
@Override
public Long convertToId(String vmName) {
if (!VirtualMachineName.isValidSystemVmName(vmName, _instance, _internalLbVmNamePrefix)) {
return null;
}
return VirtualMachineName.getRouterId(vmName);
}
// @Override
// public Long convertToId(String vmName) {
// if (!VirtualMachineName.isValidSystemVmName(vmName, _instance, _internalLbVmNamePrefix)) {
// return null;
// }
//
// return VirtualMachineName.getRouterId(vmName);
// }
@Override
public void prepareStop(VirtualMachineProfile profile) {