|
18 | 18 |
|
19 | 19 | import java.util.List; |
20 | 20 | import java.util.Map; |
21 | | -import java.util.Random; |
22 | 21 |
|
23 | 22 | import javax.ejb.Local; |
24 | 23 | import javax.inject.Inject; |
25 | 24 | import javax.naming.ConfigurationException; |
26 | 25 |
|
27 | | -import org.apache.log4j.Logger; |
28 | | - |
29 | 26 | import org.apache.cloudstack.framework.config.dao.ConfigurationDao; |
30 | | -import org.apache.cloudstack.framework.security.keystore.KeystoreDao; |
31 | | -import org.apache.cloudstack.framework.security.keystore.KeystoreManager; |
32 | 27 |
|
33 | 28 | import com.cloud.agent.api.StartupCommand; |
34 | 29 | import com.cloud.agent.api.StartupProxyCommand; |
35 | 30 | import com.cloud.host.Host.Type; |
36 | 31 | import com.cloud.host.HostVO; |
37 | | -import com.cloud.host.dao.HostDao; |
38 | 32 | import com.cloud.info.ConsoleProxyInfo; |
39 | 33 | import com.cloud.resource.ResourceManager; |
40 | 34 | import com.cloud.resource.ResourceStateAdapter; |
|
43 | 37 | import com.cloud.utils.NumbersUtil; |
44 | 38 | import com.cloud.vm.VMInstanceVO; |
45 | 39 | import com.cloud.vm.dao.ConsoleProxyDao; |
46 | | -import com.cloud.vm.dao.VMInstanceDao; |
47 | 40 |
|
48 | 41 | @Local(value = {ConsoleProxyManager.class}) |
49 | 42 | public class StaticConsoleProxyManager extends AgentBasedConsoleProxyManager implements ConsoleProxyManager, ResourceStateAdapter { |
50 | | - private static final Logger s_logger = Logger.getLogger(StaticConsoleProxyManager.class); |
51 | 43 |
|
52 | 44 | @Inject |
53 | 45 | ConsoleProxyDao _proxyDao; |
54 | 46 | @Inject |
55 | 47 | ResourceManager _resourceMgr; |
56 | 48 | @Inject |
57 | 49 | ConfigurationDao _configDao; |
58 | | - @Inject |
59 | | - private VMInstanceDao _instanceDao; |
60 | | - @Inject |
61 | | - KeystoreDao _ksDao; |
62 | | - @Inject |
63 | | - private KeystoreManager _ksMgr; |
64 | | - @Inject |
65 | | - private HostDao _hostDao; |
66 | | - private final Random _random = new Random(System.currentTimeMillis()); |
67 | | - private String _hashKey; |
68 | 50 | private String _ip = null; |
69 | 51 |
|
70 | 52 | public StaticConsoleProxyManager() { |
|
0 commit comments