Skip to content

Commit 5145c3c

Browse files
xueyuanxueyuan
committed
Removed the generics from VirtualMachineGurur
1 parent e33bc08 commit 5145c3c

14 files changed

Lines changed: 222 additions & 340 deletions

‎engine/components-api/src/com/cloud/vm/VirtualMachineGuru.java‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,7 @@
2525
* A VirtualMachineGuru knows how to process a certain type of virtual machine.
2626
*
2727
*/
28-
public interface VirtualMachineGuru<T extends VirtualMachine> {
29-
/**
30-
* Find the virtual machine by name.
31-
* @param name
32-
* @return virtual machine.
33-
*/
34-
T findByName(String name);
35-
36-
T findById(long id);
37-
38-
T persist(T vm);
28+
public interface VirtualMachineGuru {
3929

4030
boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context);
4131

@@ -57,21 +47,9 @@ public interface VirtualMachineGuru<T extends VirtualMachine> {
5747
*/
5848
boolean finalizeStart(VirtualMachineProfile profile, long hostId, Commands cmds, ReservationContext context);
5949

60-
boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile profile);
61-
6250
void finalizeStop(VirtualMachineProfile profile, StopAnswer answer);
6351

64-
void finalizeExpunge(T vm);
65-
66-
/**
67-
* Returns the id parsed from the name. If it cannot parse the name,
68-
* then return null. This method is used to determine if this is
69-
* the right handler for this vm.
70-
*
71-
* @param vmName vm name coming form the agent.
72-
* @return id if the handler works for this vm and can parse id. null if not.
73-
*/
74-
Long convertToId(String vmName);
52+
void finalizeExpunge(VirtualMachine vm);
7553

7654
/**
7755
* Prepare Vm for Stop

‎engine/components-api/src/com/cloud/vm/VirtualMachineManager.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// to you under the Apache License, Version 2.0 (the
66
// "License"); you may not use this file except in compliance
77
// with the License. You may obtain a copy of the License at
8-
//
8+
//
99
// http://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing,
@@ -92,11 +92,13 @@ <T extends VMInstanceVO> T allocate(T vm,
9292

9393
<T extends VMInstanceVO> boolean expunge(T vm, User caller, Account account) throws ResourceUnavailableException;
9494

95-
<T extends VMInstanceVO> void registerGuru(VirtualMachine.Type type, VirtualMachineGuru<T> guru);
95+
void registerGuru(VirtualMachine.Type type, VirtualMachineGuru guru);
9696

97-
Collection<VirtualMachineGuru<? extends VMInstanceVO>> getRegisteredGurus();
97+
// FIXME: This method is added by VirtualMachinePowerStateSyncImpl
98+
Collection<VirtualMachineGuru> getRegisteredGurus();
9899

99-
<T extends VMInstanceVO> VirtualMachineGuru<T> getVmGuru(T vm);
100+
// FIXME: Apparently this method is added by Kelven for VmWorkJobDispatcher. Should look into removing this.
101+
VirtualMachineGuru getVmGuru(VirtualMachine vm);
100102

101103
boolean stateTransitTo(VMInstanceVO vm, VirtualMachine.Event e, Long hostId) throws NoTransitionException;
102104

@@ -159,15 +161,15 @@ <T extends VMInstanceVO> T allocate(T vm,
159161
* @throws ResourceUnavailableException
160162
* @throws InsufficientCapacityException
161163
*/
162-
NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile requested) throws ConcurrentOperationException,
164+
NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile requested) throws ConcurrentOperationException,
163165
ResourceUnavailableException, InsufficientCapacityException;
164166

165167
/**
166168
* @param vm
167169
* @param nic
168170
* @return
169-
* @throws ResourceUnavailableException
170-
* @throws ConcurrentOperationException
171+
* @throws ResourceUnavailableException
172+
* @throws ConcurrentOperationException
171173
*/
172174
boolean removeNicFromVm(VirtualMachine vm, NicVO nic) throws ConcurrentOperationException, ResourceUnavailableException;
173175

@@ -176,8 +178,8 @@ NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile request
176178
* @param network
177179
* @param broadcastUri TODO
178180
* @return
179-
* @throws ResourceUnavailableException
180-
* @throws ConcurrentOperationException
181+
* @throws ResourceUnavailableException
182+
* @throws ConcurrentOperationException
181183
*/
182184
boolean removeVmFromNetwork(VirtualMachine vm, Network network, URI broadcastUri) throws ConcurrentOperationException, ResourceUnavailableException;
183185

@@ -213,6 +215,6 @@ <T extends VMInstanceVO> T migrateForScale(T vm, long srcHostId, DeployDestinati
213215
<T extends VMInstanceVO> T processVmStartWork(T vm, Map<VirtualMachineProfile.Param, Object> params, User caller, Account account, DeploymentPlan planToDeploy)
214216
throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException;
215217

216-
<T extends VMInstanceVO> boolean processVmStopWork(T vm, boolean forced, User user, Account account)
218+
<T extends VMInstanceVO> boolean processVmStopWork(T vm, boolean forced, User user, Account account)
217219
throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException;
218220
}

‎plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
@Component
142142
@Local(value = { ElasticLoadBalancerManager.class })
143143
public class ElasticLoadBalancerManagerImpl extends ManagerBase implements
144-
ElasticLoadBalancerManager, VirtualMachineGuru<DomainRouterVO> {
144+
ElasticLoadBalancerManager, VirtualMachineGuru {
145145
private static final Logger s_logger = Logger
146146
.getLogger(ElasticLoadBalancerManagerImpl.class);
147147

@@ -770,24 +770,24 @@ public void handleDeleteLoadBalancerRule(LoadBalancer lb, long userId, Account c
770770
}
771771
}
772772

773-
@Override
774-
public DomainRouterVO findByName(String name) {
775-
if (!VirtualMachineName.isValidSystemVmName(name, _instance, _elbVmNamePrefix)) {
776-
return null;
777-
}
778-
779-
return _routerDao.findById(VirtualMachineName.getSystemVmId(name));
780-
}
781-
782-
@Override
783-
public DomainRouterVO findById(long id) {
784-
return _routerDao.findById(id);
785-
}
786-
787-
@Override
788-
public DomainRouterVO persist(DomainRouterVO elbVm) {
789-
return _routerDao.persist(elbVm);
790-
}
773+
// @Override
774+
// public DomainRouterVO findByName(String name) {
775+
// if (!VirtualMachineName.isValidSystemVmName(name, _instance, _elbVmNamePrefix)) {
776+
// return null;
777+
// }
778+
//
779+
// return _routerDao.findById(VirtualMachineName.getSystemVmId(name));
780+
// }
781+
//
782+
// @Override
783+
// public DomainRouterVO findById(long id) {
784+
// return _routerDao.findById(id);
785+
// }
786+
//
787+
// @Override
788+
// public DomainRouterVO persist(DomainRouterVO elbVm) {
789+
// return _routerDao.persist(elbVm);
790+
// }
791791

792792
@Override
793793
public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) {
@@ -900,7 +900,7 @@ public boolean finalizeStart(VirtualMachineProfile profile, long hostId, Command
900900
return true;
901901
}
902902

903-
@Override
903+
904904
public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile profile) {
905905
DomainRouterVO elbVm = _routerDao.findById(profile.getId());
906906
DataCenterVO dcVo = _dcDao.findById(profile.getVirtualMachine().getDataCenterId());
@@ -967,19 +967,19 @@ public void processStopOrRebootAnswer(final DomainRouterVO elbVm, Answer answer)
967967
}
968968

969969
@Override
970-
public void finalizeExpunge(DomainRouterVO vm) {
970+
public void finalizeExpunge(VirtualMachine vm) {
971971
// no-op
972972

973973
}
974974

975-
@Override
976-
public Long convertToId(String vmName) {
977-
if (!VirtualMachineName.isValidSystemVmName(vmName, _instance, _elbVmNamePrefix)) {
978-
return null;
979-
}
980-
981-
return VirtualMachineName.getSystemVmId(vmName);
982-
}
975+
// @Override
976+
// public Long convertToId(String vmName) {
977+
// if (!VirtualMachineName.isValidSystemVmName(vmName, _instance, _elbVmNamePrefix)) {
978+
// return null;
979+
// }
980+
//
981+
// return VirtualMachineName.getSystemVmId(vmName);
982+
// }
983983

984984
@Override
985985
public void prepareStop(VirtualMachineProfile profile) {

‎server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
//
165165
@Local(value = { ConsoleProxyManager.class, ConsoleProxyService.class })
166166
public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxyManager,
167-
VirtualMachineGuru<ConsoleProxyVO>, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
167+
VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
168168
private static final Logger s_logger = Logger.getLogger(ConsoleProxyManagerImpl.class);
169169

170170
private static final int DEFAULT_CAPACITY_SCAN_INTERVAL = 30000; // 30 seconds
@@ -1023,13 +1023,13 @@ public boolean stop() {
10231023
return true;
10241024
}
10251025

1026-
@Override
1027-
public Long convertToId(String vmName) {
1028-
if (!VirtualMachineName.isValidConsoleProxyName(vmName, _instance)) {
1029-
return null;
1030-
}
1031-
return VirtualMachineName.getConsoleProxyId(vmName);
1032-
}
1026+
// @Override
1027+
// public Long convertToId(String vmName) {
1028+
// if (!VirtualMachineName.isValidConsoleProxyName(vmName, _instance)) {
1029+
// return null;
1030+
// }
1031+
// return VirtualMachineName.getConsoleProxyId(vmName);
1032+
// }
10331033

10341034
@Override
10351035
public boolean stopProxy(long proxyVmId) {
@@ -1429,7 +1429,6 @@ public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile,
14291429
return true;
14301430
}
14311431

1432-
@Override
14331432
public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile profile) {
14341433

14351434
NicProfile managementNic = null;
@@ -1487,7 +1486,8 @@ public boolean finalizeStart(VirtualMachineProfile profile, long hostId, Command
14871486
}
14881487

14891488
@Override
1490-
public void finalizeExpunge(ConsoleProxyVO proxy) {
1489+
public void finalizeExpunge(VirtualMachine vm) {
1490+
ConsoleProxyVO proxy = _consoleProxyDao.findById(vm.getId());
14911491
proxy.setPublicIpAddress(null);
14921492
proxy.setPublicMacAddress(null);
14931493
proxy.setPublicNetmask(null);
@@ -1498,23 +1498,23 @@ public void finalizeExpunge(ConsoleProxyVO proxy) {
14981498

14991499

15001500

1501-
@Override
1502-
public ConsoleProxyVO persist(ConsoleProxyVO proxy) {
1503-
return _consoleProxyDao.persist(proxy);
1504-
}
1505-
1506-
@Override
1507-
public ConsoleProxyVO findById(long id) {
1508-
return _consoleProxyDao.findById(id);
1509-
}
1510-
1511-
@Override
1512-
public ConsoleProxyVO findByName(String name) {
1513-
if (!VirtualMachineName.isValidConsoleProxyName(name)) {
1514-
return null;
1515-
}
1516-
return findById(VirtualMachineName.getConsoleProxyId(name));
1517-
}
1501+
// @Override
1502+
// public ConsoleProxyVO persist(ConsoleProxyVO proxy) {
1503+
// return _consoleProxyDao.persist(proxy);
1504+
// }
1505+
//
1506+
// @Override
1507+
// public ConsoleProxyVO findById(long id) {
1508+
// return _consoleProxyDao.findById(id);
1509+
// }
1510+
//
1511+
// @Override
1512+
// public ConsoleProxyVO findByName(String name) {
1513+
// if (!VirtualMachineName.isValidConsoleProxyName(name)) {
1514+
// return null;
1515+
// }
1516+
// return findById(VirtualMachineName.getConsoleProxyId(name));
1517+
// }
15181518

15191519
@Override
15201520
public void finalizeStop(VirtualMachineProfile profile, StopAnswer answer) {
@@ -1726,7 +1726,7 @@ public void prepareStop(VirtualMachineProfile profile) {
17261726
public void vmWorkStart(VmWork work) {
17271727
assert(work instanceof VmWorkStart);
17281728

1729-
ConsoleProxyVO vm = findById(work.getVmId());
1729+
ConsoleProxyVO vm = _consoleProxyDao.findById(work.getVmId());
17301730

17311731
UserVO user = _entityMgr.findById(UserVO.class, work.getUserId());
17321732
AccountVO account = _entityMgr.findById(AccountVO.class, work.getAccountId());
@@ -1747,7 +1747,7 @@ public void vmWorkStart(VmWork work) {
17471747
public void vmWorkStop(VmWork work) {
17481748
assert(work instanceof VmWorkStop);
17491749

1750-
ConsoleProxyVO vm = findById(work.getVmId());
1750+
ConsoleProxyVO vm = _consoleProxyDao.findById(work.getVmId());
17511751

17521752
UserVO user = _entityMgr.findById(UserVO.class, work.getUserId());
17531753
AccountVO account = _entityMgr.findById(AccountVO.class, work.getAccountId());

0 commit comments

Comments
 (0)