Fix test failures

Author: vishesh92

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

@@ -32,7 +32,6 @@
 import javax.naming.ConfigurationException;
 
 import com.cloud.utils.compression.CompressionUtil;
-import com.cloud.vm.UserVmManager;
 import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd;
 import org.apache.cloudstack.config.ApiServiceConfiguration;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -146,8 +145,6 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast
     private NicDao _nicDao;
     @Inject
     private UserDataManager userDataManager;
-    @Inject
-    private UserVmManager userVmManager;
 
     String _instance;
 

plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java

@@ -38,7 +38,6 @@
 import com.cloud.event.ActionEvent;
 import com.cloud.event.EventTypes;
 import com.cloud.utils.compression.CompressionUtil;
-import com.cloud.vm.UserVmManager;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
@@ -184,8 +183,6 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In
     UserDao _userDao;
     @Inject
     private UserDataManager userDataManager;
-    @Inject
-    private UserVmManager userVmManager;
 
     @Override
     public boolean finalizeVirtualMachineProfile(final VirtualMachineProfile profile, final DeployDestination dest, final ReservationContext context) {

plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java

@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 
+import org.apache.cloudstack.userdata.UserDataManager;
 import org.mockito.Mockito;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -166,6 +167,11 @@ public AccountDao accountDao() {
             return Mockito.mock(AccountDao.class);
         }
 
+        @Bean
+        public UserDataManager userDataManager() {
+            return Mockito.mock(UserDataManager.class);
+        }
+
         @Override
         public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {
             mdr.getClassMetadata().getClassName();

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

@@ -33,7 +33,6 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.vm.UserVmManager;
 import com.cloud.utils.compression.CompressionUtil;
 import org.apache.cloudstack.agent.lb.IndirectAgentLB;
 import org.apache.cloudstack.ca.CAManager;
@@ -235,8 +234,6 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
     private NetworkOrchestrationService networkMgr;
     @Inject
     private UserDataManager userDataManager;
-    @Inject
-    private UserVmManager userVmManager;
 
     private ConsoleProxyListener consoleProxyListener;
 

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

@@ -50,7 +50,6 @@
 import javax.naming.ConfigurationException;
 
 import com.cloud.utils.compression.CompressionUtil;
-import com.cloud.vm.UserVmManager;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
@@ -359,9 +358,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
 
     @Inject
     private UserDataManager userDataManager;
-    @Inject
-    private UserVmManager userVmManager;
-
     private int _routerStatsInterval = 300;
     private int _routerCheckInterval = 30;
     private int _rvrStatusUpdatePoolSize = 10;

services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

@@ -37,7 +37,6 @@
 import javax.naming.ConfigurationException;
 
 import com.cloud.utils.compression.CompressionUtil;
-import com.cloud.vm.UserVmManager;
 import org.apache.cloudstack.agent.lb.IndirectAgentLB;
 import org.apache.cloudstack.ca.CAManager;
 import org.apache.cloudstack.context.CallContext;
@@ -262,8 +261,6 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
     private CAManager caManager;
     @Inject
     private UserDataManager userDataManager;
-    @Inject
-    private UserVmManager userVmManager;
 
     private int _secStorageVmMtuSize;