add unit test back, primary storage life cycle is tested

core/src/com/cloud/storage/StoragePoolVO.java

@@ -49,7 +49,7 @@ public class StoragePoolVO implements StoragePool {
     
     @Column(name="pool_type", updatable=false, nullable=false, length=32)
     @Enumerated(value=EnumType.STRING)
-    private StoragePoolType protocol;
+    private StoragePoolType poolType;
     
     @Column(name=GenericDao.CREATED_COLUMN)
     Date created;
@@ -112,7 +112,7 @@ public class StoragePoolVO implements StoragePool {
 	
 	@Override
     public StoragePoolType getPoolType() {
-		return protocol;
+		return poolType;
 	}
 
 	@Override
@@ -215,7 +215,7 @@ public class StoragePoolVO implements StoragePool {
         this.name  = name;
         this.id = poolId;
         this.uuid = uuid;
-        this.protocol = type;
+        this.poolType = type;
         this.dataCenterId = dataCenterId;
         this.availableBytes = availableBytes;
         this.capacityBytes = capacityBytes;
@@ -227,11 +227,11 @@ public class StoragePoolVO implements StoragePool {
     }
     
     public StoragePoolVO(StoragePoolVO that) {
-        this(that.id, that.name, that.uuid, that.protocol, that.dataCenterId, that.podId, that.availableBytes, that.capacityBytes, that.hostAddress, that.port, that.path);
+        this(that.id, that.name, that.uuid, that.poolType, that.dataCenterId, that.podId, that.availableBytes, that.capacityBytes, that.hostAddress, that.port, that.path);
     }
     
     public StoragePoolVO(StoragePoolType type, String hostAddress, int port, String path) {
-        this.protocol = type;
+        this.poolType = type;
         this.hostAddress = hostAddress;
         this.port = port;
         this.path = path;
@@ -240,7 +240,7 @@ public class StoragePoolVO implements StoragePool {
     }
 
     public StoragePoolVO(StoragePoolType type, String hostAddress, int port, String path, String userInfo) {
-        this.protocol = type;
+        this.poolType = type;
         this.hostAddress = hostAddress;
         this.port = port;
         this.path = path;
@@ -285,12 +285,12 @@ public class StoragePoolVO implements StoragePool {
     
     @Override
     public boolean isShared() {
-    	return protocol.isShared();
+    	return poolType.isShared();
     }
     
     @Override
     public boolean isLocal() {
-    	return !protocol.isShared();
+    	return !poolType.isShared();
     }
     
     @Transient
@@ -341,6 +341,6 @@ public class StoragePoolVO implements StoragePool {
 	
     @Override
     public String toString() {
-        return new StringBuilder("Pool[").append(id).append("|").append(protocol).append("]").toString();
+        return new StringBuilder("Pool[").append(id).append("|").append(poolType).append("]").toString();
     }
 }

engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java

@@ -37,7 +37,7 @@ public class HostDetailsDaoImpl extends GenericDaoBase<DetailVO, Long> implement
     protected final SearchBuilder<DetailVO> HostSearch;
     protected final SearchBuilder<DetailVO> DetailSearch;
     
-    protected HostDetailsDaoImpl() {
+    public HostDetailsDaoImpl() {
         HostSearch = createSearchBuilder();
         HostSearch.and("hostId", HostSearch.entity().getHostId(), SearchCriteria.Op.EQ);
         HostSearch.done();

engine/storage/integration-test/pom.xml

@@ -32,6 +32,12 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-engine-storage-snapshot</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-engine-storage-image</artifactId>

engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java

@@ -16,12 +16,38 @@
 // under the License.
 package org.apache.cloudstack.storage.test;
 
+import org.apache.cloudstack.acl.APIChecker;
+import org.apache.cloudstack.engine.service.api.OrchestrationService;
 import org.apache.cloudstack.storage.HostEndpointRpcServer;
+import org.apache.cloudstack.storage.endpoint.DefaultEndPointSelector;
+import org.apache.cloudstack.storage.endpoint.EndPointSelector;
 import org.mockito.Mockito;
 import org.springframework.context.annotation.Bean;
 
 import com.cloud.agent.AgentManager;
+import com.cloud.cluster.ClusteredAgentRebalanceService;
+import com.cloud.cluster.agentlb.dao.HostTransferMapDao;
+import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.ClusterDaoImpl;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.DataCenterDaoImpl;
+import com.cloud.dc.dao.DataCenterIpAddressDaoImpl;
+import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl;
+import com.cloud.dc.dao.DataCenterVnetDaoImpl;
+import com.cloud.dc.dao.DcDetailsDaoImpl;
+import com.cloud.dc.dao.HostPodDao;
+import com.cloud.dc.dao.HostPodDaoImpl;
+import com.cloud.dc.dao.PodVlanDaoImpl;
 import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostDetailsDao;
+import com.cloud.host.dao.HostDetailsDaoImpl;
+import com.cloud.host.dao.HostTagsDao;
+import com.cloud.host.dao.HostTagsDaoImpl;
+import com.cloud.server.auth.UserAuthenticator;
+import com.cloud.storage.dao.StoragePoolHostDao;
+import com.cloud.storage.dao.StoragePoolHostDaoImpl;
+import com.cloud.utils.component.ComponentContext;
 
 public class ChildTestConfiguration extends TestConfiguration {
 	
@@ -33,6 +59,53 @@ public class ChildTestConfiguration extends TestConfiguration {
 		return nDao;
 	}
 	
+	@Bean
+	public EndPointSelector selector() {
+	    return Mockito.mock(EndPointSelector.class);
+	}
+	@Bean
+	public DataCenterDao dcDao() {
+	    return new DataCenterDaoImpl();
+	}
+	@Bean
+	public HostDetailsDao hostDetailsDao() {
+	    return new HostDetailsDaoImpl();
+	}
+	
+	@Bean
+	public HostTagsDao hostTagsDao() {
+	    return new HostTagsDaoImpl();
+	}
+	
+	@Bean ClusterDao clusterDao() {
+	    return new ClusterDaoImpl();
+	}
+	
+	@Bean HostTransferMapDao hostTransferDao() {
+	    return new HostTransferMapDaoImpl();
+	}
+	@Bean DataCenterIpAddressDaoImpl dataCenterIpAddressDaoImpl() {
+	    return new DataCenterIpAddressDaoImpl();
+	}
+	@Bean DataCenterLinkLocalIpAddressDaoImpl dataCenterLinkLocalIpAddressDaoImpl() {
+	    return new DataCenterLinkLocalIpAddressDaoImpl();
+	}
+	@Bean DataCenterVnetDaoImpl dataCenterVnetDaoImpl() {
+	    return new DataCenterVnetDaoImpl();
+	}
+	@Bean PodVlanDaoImpl podVlanDaoImpl() {
+	    return new PodVlanDaoImpl();
+	}
+	@Bean DcDetailsDaoImpl dcDetailsDaoImpl() {
+	    return new DcDetailsDaoImpl();
+	}
+	@Bean HostPodDao hostPodDao() {
+	    return new HostPodDaoImpl();
+	}
+	@Bean StoragePoolHostDao storagePoolHostDao() {
+	    return new StoragePoolHostDaoImpl();
+	}
+	
 	@Bean
 	public AgentManager agentMgr() {
 		return new DirectAgentManagerSimpleImpl();
@@ -42,6 +115,22 @@ public class ChildTestConfiguration extends TestConfiguration {
     public HostEndpointRpcServer rpcServer() {
         return new MockHostEndpointRpcServerDirectCallResource();
     }
+    @Bean
+    public ClusteredAgentRebalanceService _rebalanceService() {
+        return Mockito.mock(ClusteredAgentRebalanceService.class);
+    }
+    @Bean
+    public UserAuthenticator authenticator() {
+        return Mockito.mock(UserAuthenticator.class);
+    }
+    @Bean
+    public OrchestrationService orchSrvc() {
+        return Mockito.mock(OrchestrationService.class);
+    }
+    @Bean
+    public APIChecker apiChecker() {
+        return Mockito.mock(APIChecker.class);
+    }
 /*	@Override
 	@Bean
 	public PrimaryDataStoreDao primaryDataStoreDao() {

engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java

@@ -18,6 +18,8 @@
  */
 package org.apache.cloudstack.storage.test;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -33,12 +35,15 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreRole;
+import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.type.RootDisk;
+import org.apache.cloudstack.storage.HypervisorHostEndPoint;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreVO;
 import org.apache.cloudstack.storage.datastore.provider.DataStoreProvider;
 import org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManager;
+import org.apache.cloudstack.storage.endpoint.EndPointSelector;
 import org.apache.cloudstack.storage.image.ImageService;
 import org.apache.cloudstack.storage.image.db.ImageDataDao;
 import org.apache.cloudstack.storage.image.db.ImageDataVO;
@@ -66,7 +71,7 @@ import com.cloud.org.Managed.ManagedState;
 import com.cloud.resource.ResourceState;
 import com.cloud.storage.Storage.TemplateType;
 
-@ContextConfiguration(locations="classpath:/storageContext.xml")
+@ContextConfiguration(locations={"classpath:/storageContext.xml"})
 public class volumeServiceTest extends CloudStackTestNGBase {
 	//@Inject
 	//ImageDataStoreProviderManager imageProviderMgr;
@@ -92,6 +97,8 @@ public class volumeServiceTest extends CloudStackTestNGBase {
 	DataStoreProviderManager dataStoreProviderMgr;
 	@Inject
 	AgentManager agentMgr;
+	@Inject
+	EndPointSelector selector;
 	Long dcId;
 	Long clusterId;
 	Long podId;
@@ -101,7 +108,12 @@ public class volumeServiceTest extends CloudStackTestNGBase {
 	
     @Test(priority = -1)
 	public void setUp() {
-        
+        try {
+            dataStoreProviderMgr.configure(null, new HashMap<String, Object>());
+        } catch (ConfigurationException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
         host = hostDao.findByGuid(this.getHostGuid());
         if (host != null) {
             dcId = host.getDataCenterId();
@@ -143,13 +155,8 @@ public class volumeServiceTest extends CloudStackTestNGBase {
 		host.setClusterId(cluster.getId());
 
 		host = hostDao.persist(host);
-		try {
+
-            dataStoreProviderMgr.configure(null, new HashMap<String, Object>());
+		//primaryStore = createPrimaryDataStore();
-        } catch (ConfigurationException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-		primaryStore = createPrimaryDataStore();
 	
 		//CreateVolumeAnswer createVolumeFromImageAnswer = new CreateVolumeAnswer(UUID.randomUUID().toString());
 
@@ -175,7 +182,12 @@ public class volumeServiceTest extends CloudStackTestNGBase {
         List<HostVO> results = new ArrayList<HostVO>();
         results.add(host);
         Mockito.when(hostDao.listAll()).thenReturn(results);
+        Mockito.when(hostDao.findById(Mockito.anyLong())).thenReturn(host);
         Mockito.when(hostDao.findHypervisorHostInCluster(Mockito.anyLong())).thenReturn(results);
+        List<EndPoint> eps = new ArrayList<EndPoint>();
+        eps.add(HypervisorHostEndPoint.getHypervisorHostEndPoint(host.getId(),
+                host.getPrivateIpAddress()));
+        Mockito.when(selector.selectAll(Mockito.any(DataStore.class))).thenReturn(eps);
     }
 
 	private ImageDataVO createImageData() {
@@ -220,16 +232,50 @@ public class volumeServiceTest extends CloudStackTestNGBase {
 	public void createTemplateTest() {
 		createTemplate();
 	}
+	
+	@Test
+	public void testCreatePrimaryStorage() {
+	    DataStoreProvider provider = dataStoreProviderMgr.getDataStoreProvider("default primary data store provider");
+        Map<String, String> params = new HashMap<String, String>();
+        URI uri = null;
+        try {
+            uri = new URI(this.getPrimaryStorageUrl());
+        } catch (URISyntaxException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        params.put("url", this.getPrimaryStorageUrl());
+        params.put("server", uri.getHost());
+        params.put("path", uri.getPath());
+        params.put("protocol", uri.getScheme());
+        params.put("dcId", dcId.toString());
+        params.put("clusterId", clusterId.toString());
+        params.put("name", this.primaryName);
+        params.put("port", "1");
+        params.put("roles", DataStoreRole.Primary.toString());
+        params.put("uuid", UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
+        params.put("providerId", String.valueOf(provider.getId()));
+        
+        DataStoreLifeCycle lifeCycle = provider.getLifeCycle();
+        DataStore store = lifeCycle.initialize(params);
+        ClusterScope scope = new ClusterScope(clusterId, podId, dcId);
+        lifeCycle.attachCluster(store, scope);
+	}
 
 	@Test
 	public PrimaryDataStoreInfo createPrimaryDataStore() {
-		try {
+		try {/*
 		    DataStoreProvider provider = dataStoreProviderMgr.getDataStoreProvider("default primary data store provider");
 		    Map<String, String> params = new HashMap<String, String>();
-            params.put("url", this.getPrimaryStorageUrl());
+		    URI uri = new URI(this.getPrimaryStorageUrl());
+		    params.put("url", this.getPrimaryStorageUrl());
+            params.put("server", uri.getHost());
+            params.put("path", uri.getPath());
+            params.put("protocol", uri.getScheme());
             params.put("dcId", dcId.toString());
             params.put("clusterId", clusterId.toString());
             params.put("name", this.primaryName);
+            params.put("port", "1");
             params.put("roles", DataStoreRole.Primary.toString());
             params.put("uuid", UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
             params.put("providerId", String.valueOf(provider.getId()));
@@ -238,6 +284,7 @@ public class volumeServiceTest extends CloudStackTestNGBase {
 		    DataStore store = lifeCycle.initialize(params);
 		    ClusterScope scope = new ClusterScope(clusterId, podId, dcId);
 		    lifeCycle.attachCluster(store, scope);
+		    */
 		    /*
 		    PrimaryDataStoreProvider provider = primaryDataStoreProviderMgr.getDataStoreProvider("default primary data store provider");
 		    primaryDataStoreProviderMgr.configure("primary data store mgr", new HashMap<String, Object>());
@@ -306,7 +353,7 @@ public class volumeServiceTest extends CloudStackTestNGBase {
 	}
 
 	//@Test
-	@Test
+	//@Test
     public void test1() {
 		/*System.out.println(VolumeTypeHelper.getType("Root"));
 		System.out.println(VolumeDiskTypeHelper.getDiskType("vmdk"));

engine/storage/integration-test/test/resource/storageContext.xml

@@ -1,22 +1,14 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+  license agreements. See the NOTICE file distributed with this work for additional 
+  information regarding copyright ownership. The ASF licenses this file to 
+  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  this file except in compliance with the License. You may obtain a copy of 
+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+  by applicable law or agreed to in writing, software distributed under the 
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  OF ANY KIND, either express or implied. See the License for the specific 
+  language governing permissions and limitations under the License. -->
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
   xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
@@ -29,59 +21,62 @@
                                  http://www.springframework.org/schema/context
                                           http://www.springframework.org/schema/context/spring-context-3.0.xsd">
   <context:annotation-config />
-  <context:component-scan base-package="org.apache.cloudstack.storage" />
+  <context:component-scan
-  <context:component-scan base-package="org.apache.cloudstack.engine.subsystem.api.storage" />
+    base-package="org.apache.cloudstack.storage" />
-  <context:component-scan base-package="com.cloud.utils.db" />
+    <context:component-scan base-package="com.cloud.utils.db" />
-  <context:component-scan base-package="com.cloud.utils.component" />
+    <context:component-scan base-package="com.cloud.utils.component" />
-  <context:component-scan base-package="com.cloud.host.dao" />
-  <context:component-scan base-package="com.cloud.dc.dao" />
-  <context:component-scan base-package="com.cloud.cluster.agentlb.dao" />
- 
-   <context:component-scan base-package=" com.cloud.upgrade.dao" />
-  <tx:annotation-driven transaction-manager="transactionManager" />
-  <bean id="aopTestBean" class="org.apache.cloudstack.storage.test.AopTestAdvice"/>
-  <aop:config proxy-target-class="true" >
-    <aop:aspect id="AopTestAdvice" ref="aopTestBean">
-    <aop:pointcut id="aoptest"
-      expression="@annotation(com.cloud.utils.db.DB)" />
-      <aop:around pointcut-ref="aoptest" method="AopTestMethod"/> 
-    </aop:aspect>
     
 
-  </aop:config>
+  <aop:config proxy-target-class="true">
- 
+    <aop:aspect id="dbContextBuilder" ref="transactionContextBuilder">
+      <aop:pointcut id="captureAnyMethod" expression="execution(* *(..))" />
+
+      <aop:around pointcut-ref="captureAnyMethod" method="AroundAnyMethod" />
+    </aop:aspect>
+
+    <aop:aspect id="actionEventInterceptorAspect" ref="actionEventInterceptor">
+      <aop:pointcut id="captureEventMethod"
+        expression="execution(* *(..)) and @annotation(com.cloud.event.ActionEvent)" />
+      <aop:around pointcut-ref="captureEventMethod" method="AroundAnyMethod" />
+    </aop:aspect>
+
+  </aop:config>
+
+  <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
+  <bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
+
 
-  <bean id="someDependencyMock" class="org.apache.cloudstack.storage.test.StorageFactoryBean">
-    <constructor-arg name="classToBeMocked"
-      value="org.apache.cloudstack.storage.volume.VolumeMotionService" />
-  </bean>
-  
   <bean class="org.apache.cloudstack.storage.test.ChildTestConfiguration" />
-  
+
-  <bean id="onwireRegistry" class="org.apache.cloudstack.framework.serializer.OnwireClassRegistry"
+  <bean id="onwireRegistry"
-    init-method="scan" >
+    class="org.apache.cloudstack.framework.serializer.OnwireClassRegistry"
+    init-method="scan">
     <property name="packages">
       <list>
         <value>org.apache.cloudstack.framework</value>
       </list>
     </property>
   </bean>
-  
+
-  <bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
+  <bean id="messageSerializer"
+    class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
     <property name="onwireClassRegistry" ref="onwireRegistry" />
   </bean>
 
-  <bean id="transportProvider" class="org.apache.cloudstack.framework.server.ServerTransportProvider"  init-method="initialize">
+  <bean id="transportProvider"
+    class="org.apache.cloudstack.framework.server.ServerTransportProvider"
+    init-method="initialize">
     <property name="workerPoolSize" value="5" />
     <property name="nodeId" value="Node1" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
-  
+
-  <bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize">
+  <bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl"
+    init-method="initialize">
     <constructor-arg ref="transportProvider" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
 
-  <bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
+  <bean id="eventBus" class="org.apache.cloudstack.framework.eventbus.EventBusBase" />
 
 </beans>

engine/storage/integration-test/test/resource/testng.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite thread-count="1" verbose="1" name="storage test" annotations="JDK" parallel="classes">
   <!--describe your test environment-->

engine/storage/src/org/apache/cloudstack/storage/HypervisorHostEndPoint.java

@@ -29,21 +29,32 @@ import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.OperationTimedoutException;
+import com.cloud.utils.component.ComponentContext;
 
 public class HypervisorHostEndPoint implements EndPoint {
     private static final Logger s_logger = Logger.getLogger(HypervisorHostEndPoint.class);
-    private final long hostId;
+    private  long hostId;
-    private final String hostAddress;
+    private  String hostAddress;
     @Inject
     AgentManager agentMgr;
     @Inject
     HostEndpointRpcServer rpcServer;
 
-    public HypervisorHostEndPoint(long hostId, String hostAddress) {
+    protected HypervisorHostEndPoint() {
+      
+    }
+    
+    private void configure(long hostId, String hostAddress) {
         this.hostId = hostId;
         this.hostAddress = hostAddress;
     }
     
+    public static HypervisorHostEndPoint getHypervisorHostEndPoint(long hostId, String hostAddress) {
+        HypervisorHostEndPoint ep = ComponentContext.inject(HypervisorHostEndPoint.class);
+        ep.configure(hostId, hostAddress);
+        return ep;
+    }
+    
     public String getHostAddr() {
         return this.hostAddress;
     }

engine/storage/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java

@@ -98,6 +98,7 @@ public class PrimaryDataStoreVO implements Identity {
     private Long clusterId;
 
     @Column(name = "scope")
+    @Enumerated(value = EnumType.STRING)
     private ScopeType scope;
 
     public long getId() {

engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java

@@ -44,8 +44,8 @@ public class DataStoreProviderManagerImpl implements DataStoreProviderManager {
 
     @Override
     public DataStoreProvider getDataStoreProvider(String name) {
-        // TODO Auto-generated method stub
+        DataStoreProviderVO dspv = providerDao.findByName(name);
-        return null;
+        return providerMap.get(dspv.getUuid());
     }
 
     @Override
@@ -58,7 +58,7 @@ public class DataStoreProviderManagerImpl implements DataStoreProviderManager {
     public boolean configure(String name, Map<String, Object> params)
     		throws ConfigurationException {
     	
-/*
+
     	//TODO: hold global lock
         List<DataStoreProviderVO> providerVos = providerDao.listAll();
         for (DataStoreProvider provider : providers) {
@@ -71,20 +71,22 @@ public class DataStoreProviderManagerImpl implements DataStoreProviderManager {
                     break;
                 }
             }
-            String uuid = provider.getUuid();
+            String uuid = null;
             if (!existingProvider) {
                 uuid = UUID.nameUUIDFromBytes(provider.getName().getBytes()).toString();
                 providerVO = new DataStoreProviderVO();
                 providerVO.setName(provider.getName());
                 providerVO.setUuid(uuid);
                 providerVO = providerDao.persist(providerVO);
+            } else {
+                uuid = providerVO.getUuid();
             }
             params.put("uuid", uuid);
             params.put("id", providerVO.getId());
             provider.configure(params);
             providerMap.put(uuid, provider);
         }
-*/       
+     
         return true;
     }
 

engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java

@@ -118,7 +118,7 @@ public class DefaultEndPointSelector implements EndPointSelector {
             return null;
         }
 
-        return new HypervisorHostEndPoint(host.getId(),
+        return HypervisorHostEndPoint.getHypervisorHostEndPoint(host.getId(),
                 host.getPrivateIpAddress());
     }
 
@@ -176,7 +176,7 @@ public class DefaultEndPointSelector implements EndPointSelector {
         List<EndPoint> endPoints = new ArrayList<EndPoint>();
         if (store.getScope().getScopeType() == ScopeType.HOST) {
             HostVO host = hostDao.findById(store.getScope().getScopeId());
-            endPoints.add(new HypervisorHostEndPoint(host.getId(),
+            endPoints.add(HypervisorHostEndPoint.getHypervisorHostEndPoint(host.getId(),
                     host.getPrivateIpAddress()));
         } else if (store.getScope().getScopeType() == ScopeType.CLUSTER) {
             SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
@@ -184,7 +184,7 @@ public class DefaultEndPointSelector implements EndPointSelector {
             sc.addAnd(sc.getEntity().getStatus(), Op.EQ, Status.Up);
             List<HostVO> hosts = sc.find();
             for (HostVO host : hosts) {
-                endPoints.add(new HypervisorHostEndPoint(host.getId(),
+                endPoints.add(HypervisorHostEndPoint.getHypervisorHostEndPoint(host.getId(),
                         host.getPrivateIpAddress()));
             }
            

engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java

@@ -76,18 +76,18 @@ public class ImageDataDaoImpl extends GenericDaoBase<ImageDataVO, Long> implemen
     private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class);
 
 
-    @Inject VMTemplateZoneDao _templateZoneDao = null;
+    VMTemplateZoneDao _templateZoneDao = null;
 
-    @Inject VMTemplateDetailsDao _templateDetailsDao = null;
+    VMTemplateDetailsDao _templateDetailsDao = null;
 
 
-    @Inject ConfigurationDao _configDao = null;
+    ConfigurationDao _configDao = null;
 
-    @Inject HostDao _hostDao = null;
+    HostDao _hostDao = null;
 
-    @Inject DomainDao _domainDao = null;
+    DomainDao _domainDao = null;
 
-    @Inject DataCenterDao _dcDao = null;
+    DataCenterDao _dcDao = null;
     private final String SELECT_TEMPLATE_HOST_REF = "SELECT t.id, h.data_center_id, t.unique_name, t.name, t.public, t.featured, t.type, t.hvm, t.bits, t.url, t.format, t.created, t.account_id, "
             + "t.checksum, t.display_text, t.enable_password, t.guest_os_id, t.bootable, t.prepopulate, t.cross_zones, t.hypervisor_type FROM vm_template t";
 

engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java

@@ -49,7 +49,6 @@ public class PrimaryDataStoreHelper {
         dataStoreVO.setPath(params.get("path"));
         dataStoreVO.setPoolType(params.get("protocol"));
         dataStoreVO.setPort(Integer.parseInt(params.get("port")));
-        //dataStoreVO.setKey(params.get("key"));
         dataStoreVO.setName(params.get("name"));
         dataStoreVO.setUuid(params.get("uuid"));
         dataStoreVO = dataStoreDao.persist(dataStoreVO);

engine/storage/volume/src/org/apache/cloudstack/storage/datastore/DefaultPrimaryDataStore.java

@@ -33,6 +33,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ScopeType;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
 import org.apache.cloudstack.engine.subsystem.api.storage.disktype.DiskFormat;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreVO;
 import org.apache.cloudstack.storage.datastore.provider.DataStoreProvider;
 import org.apache.cloudstack.storage.image.ImageDataFactory;
@@ -46,7 +47,6 @@ import org.apache.cloudstack.storage.volume.db.VolumeVO;
 import org.apache.log4j.Logger;
 
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.storage.dao.StoragePoolHostDao;
 import com.cloud.utils.component.ComponentContext;
 
 public class DefaultPrimaryDataStore implements PrimaryDataStore {
@@ -54,6 +54,8 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore {
             .getLogger(DefaultPrimaryDataStore.class);
     protected PrimaryDataStoreDriver driver;
     protected PrimaryDataStoreVO pdsv;
+    @Inject
+    protected PrimaryDataStoreDao dataStoreDao;
     protected PrimaryDataStoreLifeCycle lifeCycle;
     @Inject
     private ObjectInDataStoreManager objectInStoreMgr;
@@ -66,7 +68,11 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore {
     @Inject
     private VolumeDao2 volumeDao;
 
-    private DefaultPrimaryDataStore(PrimaryDataStoreVO pdsv,
+    protected DefaultPrimaryDataStore() {
+       
+    }
+    
+    public void configure(PrimaryDataStoreVO pdsv,
             PrimaryDataStoreDriver driver, DataStoreProvider provider) {
         this.pdsv = pdsv;
         this.driver = driver;
@@ -76,9 +82,9 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore {
     public static DefaultPrimaryDataStore createDataStore(
             PrimaryDataStoreVO pdsv, PrimaryDataStoreDriver driver,
             DataStoreProvider provider) {
-        DefaultPrimaryDataStore dataStore = new DefaultPrimaryDataStore(pdsv,
+        DefaultPrimaryDataStore dataStore = (DefaultPrimaryDataStore)ComponentContext.inject(DefaultPrimaryDataStore.class);
-                driver, provider);
+        dataStore.configure(pdsv, driver, provider);
-        return ComponentContext.inject(dataStore);
+        return dataStore;
     }
 
     @Override
@@ -113,12 +119,14 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore {
     @Override
     public long getId() {
         // TODO Auto-generated method stub
-        return 0;
+        return this.pdsv.getId();
     }
 
     @Override
     public String getUri() {
-        return this.pdsv.getPoolType() + File.separator
+        String path = this.pdsv.getPath();
+        path.replaceFirst("/*", "");
+        return this.pdsv.getPoolType() + ":" + File.separator + File.separator
                 + this.pdsv.getHostAddress() + File.separator
                 + this.pdsv.getPath() + File.separator
                 + "?role=" + this.getRole()
@@ -127,11 +135,12 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore {
 
     @Override
     public Scope getScope() {
-        if (pdsv.getScope() == ScopeType.CLUSTER) {
+        PrimaryDataStoreVO vo = dataStoreDao.findById(this.pdsv.getId());
-            return new ClusterScope(pdsv.getClusterId(), pdsv.getPodId(),
+        if (vo.getScope() == ScopeType.CLUSTER) {
-                    pdsv.getDataCenterId());
+            return new ClusterScope(vo.getClusterId(), vo.getPodId(),
-        } else if (pdsv.getScope() == ScopeType.ZONE) {
+                    vo.getDataCenterId());
-            return new ZoneScope(pdsv.getDataCenterId());
+        } else if (vo.getScope() == ScopeType.ZONE) {
+            return new ZoneScope(vo.getDataCenterId());
         }
         return null;
     }

engine/storage/volume/src/org/apache/cloudstack/storage/datastore/lifecycle/DefaultPrimaryDataStoreLifeCycleImpl.java

@@ -44,9 +44,8 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 
 public class DefaultPrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
-    protected PrimaryDataStore dataStore;
     @Inject
-    EndPointSelector selecotr;
+    EndPointSelector selector;
     @Inject
     PrimaryDataStoreDao dataStoreDao;
     @Inject
@@ -67,7 +66,7 @@ public class DefaultPrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLif
 
     protected void attachCluster(DataStore store) {
         //send down AttachPrimaryDataStoreCmd command to all the hosts in the cluster
-        List<EndPoint> endPoints = selecotr.selectAll(dataStore);
+        List<EndPoint> endPoints = selector.selectAll(store);
         CreatePrimaryDataStoreCmd createCmd = new CreatePrimaryDataStoreCmd(store.getUri());
         EndPoint ep = endPoints.get(0);
         HostVO host = hostDao.findById(ep.getId());
@@ -76,7 +75,7 @@ public class DefaultPrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLif
         }
         
         endPoints.get(0).sendMessage(createCmd);
-        AttachPrimaryDataStoreCmd cmd = new AttachPrimaryDataStoreCmd(dataStore.getUri());
+        AttachPrimaryDataStoreCmd cmd = new AttachPrimaryDataStoreCmd(store.getUri());
         for (EndPoint endp : endPoints) {
             endp.sendMessage(cmd);
         }
@@ -92,6 +91,7 @@ public class DefaultPrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLif
         dataStoreVO.setScope(scope.getScopeType());
         dataStoreDao.update(dataStoreVO.getId(), dataStoreVO);
         
+        
         attachCluster(dataStore);
         
         dataStoreVO = dataStoreDao.findById(dataStore.getId());

engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/DefaultPrimaryDataStoreProviderManagerImpl.java

@@ -34,6 +34,8 @@ import org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManager
 import org.apache.cloudstack.storage.volume.PrimaryDataStoreDriver;
 import org.springframework.stereotype.Component;
 
+import com.cloud.utils.component.ComponentContext;
+
 @Component
 public class DefaultPrimaryDataStoreProviderManagerImpl implements PrimaryDataStoreProviderManager {
     @Inject
@@ -49,10 +51,10 @@ public class DefaultPrimaryDataStoreProviderManagerImpl implements PrimaryDataSt
         PrimaryDataStoreVO dataStoreVO = dataStoreDao.findById(dataStoreId);
         long providerId = dataStoreVO.getStorageProviderId();
         DataStoreProvider provider = providerManager.getDataStoreProviderById(providerId);
-        DefaultPrimaryDataStore dataStore = DefaultPrimaryDataStore.createDataStore(dataStoreVO, 
+        /*DefaultPrimaryDataStore dataStore = DefaultPrimaryDataStore.createDataStore(dataStoreVO, 
                 driverMaps.get(provider.getUuid()),
-                provider);
+                provider);*/
-
+        DefaultPrimaryDataStore dataStore = DefaultPrimaryDataStore.createDataStore(dataStoreVO, driverMaps.get(provider.getUuid()), provider);
         return dataStore;
     }
     

engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java

@@ -35,7 +35,7 @@ import com.cloud.utils.fsm.StateMachine2;
 public class VolumeManagerImpl implements VolumeManager {
     @Inject
     protected VolumeDao2 _volumeDao;
-    private final static StateMachine2<State, Event, VolumeVO> s_fsm = new StateMachine2<State, Event, VolumeVO>();
+    private final StateMachine2<State, Event, VolumeVO> s_fsm = new StateMachine2<State, Event, VolumeVO>();
     public VolumeManagerImpl() {
         initStateMachine();
     }

plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java

@@ -51,9 +51,9 @@ import com.cloud.hypervisor.vmware.VmwareCleanupMaid;
 import com.cloud.hypervisor.vmware.manager.VmwareManager;
 import com.cloud.hypervisor.vmware.mo.VirtualEthernetCardType;
 import com.cloud.network.NetworkModel;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.secstorage.CommandExecLogDao;
 import com.cloud.secstorage.CommandExecLogVO;
 import com.cloud.storage.GuestOSVO;

plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java

@@ -570,10 +570,18 @@ public class XenServerStorageResource {
     }
     
     protected Answer execute(AttachPrimaryDataStoreCmd cmd) {
-        PrimaryDataStoreTO dataStore = null;
+        String dataStoreUri = cmd.getDataStore();
         Connection conn = hypervisorResource.getConnection();
+        Map<String, String> params = null;
         try {
-            SR sr = hypervisorResource.getStorageRepository(conn, dataStore.getUuid());
+            try {
+                URI uri = new URI(dataStoreUri);
+                params = getParameters(uri);
+            } catch (URISyntaxException e1) {
+                s_logger.debug("uri exception", e1);
+                return new CreateVolumeAnswer(cmd, false, e1.toString()); 
+            }
+            SR sr = hypervisorResource.getStorageRepository(conn, params.get("storeUuid"));
             hypervisorResource.setupHeartbeatSr(conn, sr, false);
             long capacity = sr.getPhysicalSize(conn);
             long available = capacity - sr.getPhysicalUtilisation(conn);

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

@@ -75,22 +75,22 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.StorageUnavailableException;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.ElasticLbVmMapVO;
-import com.cloud.network.IPAddressVO;
-import com.cloud.network.LoadBalancerVO;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.network.NetworkManager;
 import com.cloud.network.NetworkModel;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.network.VirtualRouterProvider;
 import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
 import com.cloud.network.addr.PublicIp;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.LoadBalancerDao;
+import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.VirtualRouterProviderDao;
 import com.cloud.network.lb.LoadBalancingRule.LbDestination;

plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java

@@ -19,7 +19,7 @@ package com.cloud.network.lb.dao;
 import java.util.List;
 
 import com.cloud.network.ElasticLbVmMapVO;
-import com.cloud.network.LoadBalancerVO;
+import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.DomainRouterVO;
 

plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java

@@ -25,9 +25,9 @@ import javax.inject.Inject;
 import org.springframework.stereotype.Component;
 
 import com.cloud.network.ElasticLbVmMapVO;
-import com.cloud.network.LoadBalancerVO;
 import com.cloud.network.dao.LoadBalancerDao;
 import com.cloud.network.dao.LoadBalancerDaoImpl;
+import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.router.VirtualRouter.Role;
 import com.cloud.network.router.VirtualRouter.Role;
 

plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java

@@ -31,7 +31,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.element.F5ExternalLoadBalancerElementService;
 import com.cloud.user.UserContext;
 import com.cloud.utils.exception.CloudRuntimeException;

plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java

@@ -30,7 +30,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.element.F5ExternalLoadBalancerElementService;
 import com.cloud.user.UserContext;
 import com.cloud.utils.exception.CloudRuntimeException;

plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java

@@ -34,7 +34,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.element.F5ExternalLoadBalancerElementService;
 import com.cloud.utils.exception.CloudRuntimeException;
 

plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java

@@ -21,7 +21,8 @@ import org.apache.cloudstack.api.ApiConstants;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 
 @EntityReference(value=ExternalLoadBalancerDeviceVO.class)
 public class F5LoadBalancerResponse extends BaseResponse {

plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java

@@ -57,25 +57,25 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.network.ExternalLoadBalancerDeviceManager;
 import com.cloud.network.ExternalLoadBalancerDeviceManagerImpl;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
-import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
-import com.cloud.network.NetworkExternalLoadBalancerVO;
 import com.cloud.network.NetworkModel;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.network.PhysicalNetworkVO;
 import com.cloud.network.PublicIpAddress;
 import com.cloud.network.dao.ExternalLoadBalancerDeviceDao;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkExternalLoadBalancerDao;
+import com.cloud.network.dao.NetworkExternalLoadBalancerVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
 import com.cloud.network.lb.LoadBalancingRule;
 import com.cloud.network.resource.F5BigIpResource;
 import com.cloud.network.rules.LbStickinessMethod;

plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java

@@ -28,8 +28,9 @@ import com.cloud.api.commands.ListF5LoadBalancerNetworksCmd;
 import com.cloud.api.commands.ListF5LoadBalancersCmd;
 import com.cloud.api.response.F5LoadBalancerResponse;
 import com.cloud.host.Host;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.Network;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
+
 import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse;
 import com.cloud.utils.component.PluggableService;
 

plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java

@@ -35,7 +35,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalFirewallDeviceVO;
+import com.cloud.network.dao.ExternalFirewallDeviceVO;
 import com.cloud.network.element.JuniperSRXFirewallElementService;
 import com.cloud.user.UserContext;
 import com.cloud.utils.exception.CloudRuntimeException;

plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java

@@ -34,7 +34,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalFirewallDeviceVO;
+import com.cloud.network.dao.ExternalFirewallDeviceVO;
 import com.cloud.network.element.JuniperSRXFirewallElementService;
 import com.cloud.user.UserContext;
 import com.cloud.utils.exception.CloudRuntimeException;

plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java

@@ -33,7 +33,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalFirewallDeviceVO;
+import com.cloud.network.dao.ExternalFirewallDeviceVO;
 import com.cloud.network.element.JuniperSRXFirewallElementService;
 import com.cloud.utils.exception.CloudRuntimeException;
 

plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java

@@ -21,7 +21,8 @@ import org.apache.cloudstack.api.EntityReference;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
-import com.cloud.network.ExternalFirewallDeviceVO;
+
+import com.cloud.network.dao.ExternalFirewallDeviceVO;
 
 @EntityReference(value=ExternalFirewallDeviceVO.class)
 @SuppressWarnings("unused")

plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java

@@ -58,26 +58,26 @@ import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.network.ExternalFirewallDeviceManagerImpl;
-import com.cloud.network.ExternalFirewallDeviceVO;
-import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceState;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
-import com.cloud.network.NetworkExternalFirewallVO;
 import com.cloud.network.NetworkModel;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.network.PhysicalNetworkVO;
 import com.cloud.network.PublicIpAddress;
 import com.cloud.network.RemoteAccessVpn;
 import com.cloud.network.VpnUser;
 import com.cloud.network.dao.ExternalFirewallDeviceDao;
+import com.cloud.network.dao.ExternalFirewallDeviceVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkExternalFirewallDao;
+import com.cloud.network.dao.NetworkExternalFirewallVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState;
 import com.cloud.network.resource.JuniperSrxResource;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.PortForwardingRule;

plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java

@@ -28,8 +28,9 @@ import com.cloud.api.commands.ListSrxFirewallNetworksCmd;
 import com.cloud.api.commands.ListSrxFirewallsCmd;
 import com.cloud.api.response.SrxFirewallResponse;
 import com.cloud.host.Host;
-import com.cloud.network.ExternalFirewallDeviceVO;
 import com.cloud.network.Network;
+import com.cloud.network.dao.ExternalFirewallDeviceVO;
+
 import org.apache.cloudstack.api.response.ExternalFirewallResponse;
 import com.cloud.utils.component.PluggableService;
 

plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java

@@ -28,7 +28,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.element.NetscalerLoadBalancerElementService;
 import com.cloud.user.UserContext;
 import com.cloud.utils.exception.CloudRuntimeException;

plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java

@@ -30,7 +30,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.element.NetscalerLoadBalancerElementService;
 import com.cloud.user.UserContext;
 import com.cloud.utils.exception.CloudRuntimeException;

plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java

@@ -36,7 +36,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.element.NetscalerLoadBalancerElementService;
 import com.cloud.utils.exception.CloudRuntimeException;
 

plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java

@@ -23,7 +23,8 @@ import org.apache.cloudstack.api.EntityReference;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 
 @EntityReference(value=ExternalLoadBalancerDeviceVO.class)
 @SuppressWarnings("unused")

plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java

@@ -67,30 +67,30 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.network.ExternalLoadBalancerDeviceManager;
 import com.cloud.network.ExternalLoadBalancerDeviceManagerImpl;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
-import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState;
 import com.cloud.network.IpAddress;
 import com.cloud.network.NetScalerPodVO;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
-import com.cloud.network.NetworkExternalLoadBalancerVO;
 import com.cloud.network.NetworkModel;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.network.PhysicalNetworkVO;
 import com.cloud.network.PublicIpAddress;
 import com.cloud.network.as.AutoScaleCounter;
 import com.cloud.network.as.AutoScaleCounter.AutoScaleCounterType;
 import com.cloud.network.dao.ExternalLoadBalancerDeviceDao;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.dao.NetScalerPodDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkExternalLoadBalancerDao;
+import com.cloud.network.dao.NetworkExternalLoadBalancerVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
 import com.cloud.network.lb.LoadBalancingRule;
 import com.cloud.network.lb.LoadBalancingRule.LbDestination;
 import com.cloud.network.resource.NetscalerResource;

plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java

@@ -23,8 +23,8 @@ import com.cloud.api.commands.DeleteNetscalerLoadBalancerCmd;
 import com.cloud.api.commands.ListNetscalerLoadBalancerNetworksCmd;
 import com.cloud.api.commands.ListNetscalerLoadBalancersCmd;
 import com.cloud.api.response.NetscalerLoadBalancerResponse;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.Network;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.utils.component.PluggableService;
 
 public interface NetscalerLoadBalancerElementService extends PluggableService {

plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java

@@ -80,7 +80,6 @@ import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.network.NetworkManager;
 import com.cloud.network.NetworkModel;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.NiciraNvpDeviceVO;
@@ -88,17 +87,18 @@ import com.cloud.network.NiciraNvpNicMappingVO;
 import com.cloud.network.NiciraNvpRouterMappingVO;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.network.PhysicalNetworkVO;
 import com.cloud.network.PublicIpAddress;
 import com.cloud.network.addr.PublicIp;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.NiciraNvpDao;
 import com.cloud.network.dao.NiciraNvpNicMappingDao;
 import com.cloud.network.dao.NiciraNvpRouterMappingDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.resource.NiciraNvpResource;
 import com.cloud.network.rules.PortForwardingRule;
 import com.cloud.network.rules.StaticNat;

plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java

@@ -44,17 +44,17 @@ import com.cloud.network.Network;
 import com.cloud.network.Network.Service;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.NetworkProfile;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Network.GuestType;
 import com.cloud.network.Network.State;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.NiciraNvpDeviceVO;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetwork.IsolationMethod;
-import com.cloud.network.PhysicalNetworkVO;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.NiciraNvpDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.resource.ResourceManager;

plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java

@@ -46,14 +46,14 @@ import com.cloud.network.Network.State;
 import com.cloud.network.NetworkManager;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.NetworkProfile;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.NiciraNvpDeviceVO;
-import com.cloud.network.PhysicalNetworkVO;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.NiciraNvpDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.user.Account;

plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java

@@ -33,10 +33,10 @@ import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
 import com.cloud.network.Network;
 import com.cloud.network.Network.GuestType;
 import com.cloud.network.Network.State;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetwork.IsolationMethod;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.ovs.OvsTunnelManager;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.user.Account;

server/src/com/cloud/api/ApiDBUtils.java

@@ -106,24 +106,16 @@ import com.cloud.host.HostStats;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.IPAddressVO;
 import com.cloud.network.IpAddress;
-import com.cloud.network.LoadBalancerVO;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
-import com.cloud.network.NetworkDomainVO;
 import com.cloud.network.NetworkManager;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.NetworkProfile;
-import com.cloud.network.NetworkRuleConfigVO;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.network.PhysicalNetworkVO;
-import com.cloud.network.Site2SiteCustomerGatewayVO;
-import com.cloud.network.Site2SiteVpnGatewayVO;
 import com.cloud.network.as.AutoScalePolicy;
 import com.cloud.network.as.AutoScalePolicyConditionMapVO;
 import com.cloud.network.as.AutoScalePolicyVO;
@@ -142,17 +134,25 @@ import com.cloud.network.as.dao.CounterDao;
 import com.cloud.network.dao.FirewallRulesCidrsDao;
 import com.cloud.network.dao.FirewallRulesDao;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.LoadBalancerDao;
+import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkDomainDao;
+import com.cloud.network.dao.NetworkDomainVO;
 import com.cloud.network.dao.NetworkRuleConfigDao;
+import com.cloud.network.dao.NetworkRuleConfigVO;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
+import com.cloud.network.dao.Site2SiteCustomerGatewayVO;
 import com.cloud.network.dao.Site2SiteVpnGatewayDao;
+import com.cloud.network.dao.Site2SiteVpnGatewayVO;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.rules.FirewallRuleVO;
 import com.cloud.network.security.SecurityGroup;

server/src/com/cloud/api/ApiResponseHelper.java

@@ -156,19 +156,16 @@ import com.cloud.event.Event;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.hypervisor.HypervisorCapabilities;
-import com.cloud.network.IPAddressVO;
 import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.network.NetworkProfile;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.network.PhysicalNetworkTrafficType;
-import com.cloud.network.PhysicalNetworkVO;
 import com.cloud.network.RemoteAccessVpn;
 import com.cloud.network.Site2SiteCustomerGateway;
 import com.cloud.network.Site2SiteVpnConnection;
@@ -182,6 +179,9 @@ import com.cloud.network.as.AutoScaleVmProfileVO;
 import com.cloud.network.as.Condition;
 import com.cloud.network.as.ConditionVO;
 import com.cloud.network.as.Counter;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRuleVO;

server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java

@@ -64,8 +64,8 @@ import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.Network;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.org.Grouping;
 import com.cloud.resource.ResourceManager;
 import com.cloud.service.ServiceOfferingVO;

server/src/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -104,7 +104,6 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.IPAddressVO;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.GuestType;
@@ -113,17 +112,18 @@ import com.cloud.network.Network.Service;
 import com.cloud.network.NetworkManager;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.NetworkService;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetwork;
-import com.cloud.network.PhysicalNetworkVO;
 import com.cloud.network.dao.FirewallRulesDao;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.vpc.VpcManager;
 import com.cloud.offering.DiskOffering;
 import com.cloud.offering.NetworkOffering;

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

@@ -93,14 +93,14 @@ import com.cloud.info.RunningHostInfoAgregator.ZoneHostInfo;
 import com.cloud.keystore.KeystoreDao;
 import com.cloud.keystore.KeystoreManager;
 import com.cloud.keystore.KeystoreVO;
-import com.cloud.network.IPAddressVO;
 import com.cloud.network.Network;
 import com.cloud.network.NetworkManager;
 import com.cloud.network.NetworkModel;
-import com.cloud.network.NetworkVO;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.rules.RulesManager;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.ServiceOffering;

server/src/com/cloud/dc/dao/DataCenterDaoImpl.java

@@ -293,7 +293,7 @@ public class DataCenterDaoImpl extends GenericDaoBase<DataCenterVO, Long> implem
         return true;
     }
 
-    protected DataCenterDaoImpl() {
+    public DataCenterDaoImpl() {
         super();
         NameSearch = createSearchBuilder();
         NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ);

server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java

@@ -198,7 +198,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
         return count.get(0);
 	}
     
-    protected DataCenterIpAddressDaoImpl() {
+    public DataCenterIpAddressDaoImpl() {
         super();
         
         AllFieldsSearch = createSearchBuilder();

server/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java

@@ -151,7 +151,7 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCent
         return count.get(0);
 	}
     
-    protected DataCenterLinkLocalIpAddressDaoImpl() {
+    public DataCenterLinkLocalIpAddressDaoImpl() {
         super();
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("ip", AllFieldsSearch.entity().getIpAddress(), SearchCriteria.Op.EQ);

server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java

@@ -142,7 +142,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
         update(vo.getId(), vo);
     }
 
-    protected DataCenterVnetDaoImpl() {
+    public DataCenterVnetDaoImpl() {
     	super();
         DcSearchAllocated = createSearchBuilder();
         DcSearchAllocated.and("dc", DcSearchAllocated.entity().getDataCenterId(), SearchCriteria.Op.EQ);

server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java

@@ -36,7 +36,7 @@ public class DcDetailsDaoImpl extends GenericDaoBase<DcDetailVO, Long> implement
     protected final SearchBuilder<DcDetailVO> DcSearch;
     protected final SearchBuilder<DcDetailVO> DetailSearch;
     
-    protected DcDetailsDaoImpl() {
+    public DcDetailsDaoImpl() {
         DcSearch = createSearchBuilder();
         DcSearch.and("dcId", DcSearch.entity().getDcId(), SearchCriteria.Op.EQ);
         DcSearch.done();

server/src/com/cloud/dc/dao/HostPodDao.java

@@ -26,8 +26,6 @@ import com.cloud.vm.VirtualMachine;
 public interface HostPodDao extends GenericDao<HostPodVO, Long> {
 	public List<HostPodVO> listByDataCenterId(long id);
 
-    public List<HostPodVO> listByDataCenterIdVMTypeAndStates(long id, VirtualMachine.Type type, VirtualMachine.State... states);
-
     public HostPodVO findByName(String name, long dcId);
 	
 	public HashMap<Long, List<Object>> getCurrentPodCidrSubnets(long zoneId, long podIdToSkip);

server/src/com/cloud/dc/dao/HostPodDaoImpl.java

@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.List;
 
 import javax.ejb.Local;
-import javax.inject.Inject;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
@@ -33,26 +32,20 @@ import com.cloud.dc.HostPodVO;
 import com.cloud.org.Grouping;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
-import com.cloud.utils.db.JoinBuilder;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.db.Transaction;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.dao.VMInstanceDao;
-import com.cloud.vm.dao.VMInstanceDaoImpl;
 
 @Component
 @Local(value={HostPodDao.class})
 public class HostPodDaoImpl extends GenericDaoBase<HostPodVO, Long> implements HostPodDao {
     private static final Logger s_logger = Logger.getLogger(HostPodDaoImpl.class);
-    @Inject VMInstanceDao _vmDao;
 
     protected SearchBuilder<HostPodVO> DataCenterAndNameSearch;
     protected SearchBuilder<HostPodVO> DataCenterIdSearch;
 
-    protected HostPodDaoImpl() {
+    public HostPodDaoImpl() {
         DataCenterAndNameSearch = createSearchBuilder();
         DataCenterAndNameSearch.and("dc", DataCenterAndNameSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         DataCenterAndNameSearch.and("name", DataCenterAndNameSearch.entity().getName(), SearchCriteria.Op.EQ);
@@ -71,26 +64,6 @@ public class HostPodDaoImpl extends GenericDaoBase<HostPodVO, Long> implements H
         return listBy(sc);
     }
 
-    @Override
-    public List<HostPodVO> listByDataCenterIdVMTypeAndStates(long id, VirtualMachine.Type type, VirtualMachine.State... states) {
-        SearchBuilder<VMInstanceVO> vmInstanceSearch = _vmDao.createSearchBuilder();
-        vmInstanceSearch.and("type", vmInstanceSearch.entity().getType(), SearchCriteria.Op.EQ);
-        vmInstanceSearch.and("states", vmInstanceSearch.entity().getState(), SearchCriteria.Op.IN);
-
-        SearchBuilder<HostPodVO> podIdSearch = createSearchBuilder();
-        podIdSearch.and("dc", podIdSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
-        podIdSearch.select(null, SearchCriteria.Func.DISTINCT, podIdSearch.entity().getId());
-        podIdSearch.join("vmInstanceSearch", vmInstanceSearch, podIdSearch.entity().getId(),
-                vmInstanceSearch.entity().getPodIdToDeployIn(), JoinBuilder.JoinType.INNER);
-        podIdSearch.done();
-
-        SearchCriteria<HostPodVO> sc = podIdSearch.create();
-        sc.setParameters("dc", id);
-        sc.setJoinParameters("vmInstanceSearch", "type", type);
-        sc.setJoinParameters("vmInstanceSearch", "states", (Object[]) states);
-        return listBy(sc);
-    }
-
     @Override
     public HostPodVO findByName(String name, long dcId) {
         SearchCriteria<HostPodVO> sc = DataCenterAndNameSearch.create();

server/src/com/cloud/dc/dao/PodVlanDaoImpl.java

@@ -117,7 +117,7 @@ public class PodVlanDaoImpl extends GenericDaoBase<PodVlanVO, Long> implements G
         update(vo.getId(), vo);
     }
     
-    protected PodVlanDaoImpl() {
+    public PodVlanDaoImpl() {
     	super();
     	PodSearchAllocated = createSearchBuilder();
     	PodSearchAllocated.and("podId", PodSearchAllocated.entity().getPodId(), SearchCriteria.Op.EQ);

server/src/com/cloud/host/dao/HostDaoImpl.java

@@ -64,7 +64,7 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@Component
+
 @Local(value = { HostDao.class })
 @DB(txn = false)
 @TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)

server/src/com/cloud/host/dao/HostDetailsDaoImpl.java

@@ -37,7 +37,7 @@ public class HostDetailsDaoImpl extends GenericDaoBase<DetailVO, Long> implement
     protected final SearchBuilder<DetailVO> HostSearch;
     protected final SearchBuilder<DetailVO> DetailSearch;
     
-    protected HostDetailsDaoImpl() {
+    public HostDetailsDaoImpl() {
         HostSearch = createSearchBuilder();
         HostSearch.and("hostId", HostSearch.entity().getHostId(), SearchCriteria.Op.EQ);
         HostSearch.done();

server/src/com/cloud/host/dao/HostTagsDaoImpl.java

@@ -34,7 +34,7 @@ import com.cloud.utils.db.Transaction;
 public class HostTagsDaoImpl extends GenericDaoBase<HostTagVO, Long> implements HostTagsDao {
     protected final SearchBuilder<HostTagVO> HostSearch;
     
-    protected HostTagsDaoImpl() {
+    public HostTagsDaoImpl() {
         HostSearch = createSearchBuilder();
         HostSearch.and("hostId", HostSearch.entity().getHostId(), SearchCriteria.Op.EQ);
         HostSearch.done();        

server/src/com/cloud/network/ExternalFirewallDeviceManager.java

@@ -21,6 +21,7 @@ import java.util.List;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.host.Host;
+import com.cloud.network.dao.ExternalFirewallDeviceVO;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.PortForwardingRule;
 import com.cloud.resource.ServerResource;

server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java

@@ -63,16 +63,21 @@ import com.cloud.host.dao.HostDetailsDao;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.dao.ExternalFirewallDeviceDao;
+import com.cloud.network.dao.ExternalFirewallDeviceVO;
 import com.cloud.network.dao.FirewallRulesDao;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.InlineLoadBalancerNicMapDao;
+import com.cloud.network.dao.InlineLoadBalancerNicMapVO;
 import com.cloud.network.dao.LoadBalancerDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkExternalFirewallDao;
+import com.cloud.network.dao.NetworkExternalFirewallVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.dao.VpnUserDao;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.PortForwardingRule;

server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java

@@ -21,6 +21,7 @@ import java.util.List;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.host.Host;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.resource.ServerResource;
 import com.cloud.utils.component.Manager;

server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java

@@ -59,8 +59,6 @@ import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.host.dao.HostDetailsDao;
-import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
-import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
@@ -68,16 +66,23 @@ import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.addr.PublicIp;
 import com.cloud.network.dao.ExternalFirewallDeviceDao;
 import com.cloud.network.dao.ExternalLoadBalancerDeviceDao;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.InlineLoadBalancerNicMapDao;
+import com.cloud.network.dao.InlineLoadBalancerNicMapVO;
 import com.cloud.network.dao.LoadBalancerDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkExternalFirewallDao;
 import com.cloud.network.dao.NetworkExternalLoadBalancerDao;
+import com.cloud.network.dao.NetworkExternalLoadBalancerVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
 import com.cloud.network.element.IpDeployer;
 import com.cloud.network.element.NetworkElement;
 import com.cloud.network.element.StaticNatServiceProvider;

server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java

@@ -48,13 +48,18 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.network.dao.ExternalFirewallDeviceDao;
 import com.cloud.network.dao.ExternalLoadBalancerDeviceDao;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.InlineLoadBalancerNicMapDao;
+import com.cloud.network.dao.InlineLoadBalancerNicMapVO;
 import com.cloud.network.dao.LoadBalancerDao;
+import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkExternalFirewallDao;
 import com.cloud.network.dao.NetworkExternalLoadBalancerDao;
+import com.cloud.network.dao.NetworkExternalLoadBalancerVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.rules.dao.PortForwardingRulesDao;

server/src/com/cloud/network/NetworkManager.java

@@ -34,6 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.network.addr.PublicIp;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.element.LoadBalancingServiceProvider;
 import com.cloud.network.element.StaticNatServiceProvider;
 import com.cloud.network.element.UserDataServiceProvider;

server/src/com/cloud/network/NetworkManagerImpl.java

@@ -107,14 +107,19 @@ import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.addr.PublicIp;
 import com.cloud.network.dao.FirewallRulesDao;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.LoadBalancerDao;
+import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkDomainDao;
 import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkServiceMapVO;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.element.DhcpServiceProvider;
 import com.cloud.network.element.IpDeployer;
 import com.cloud.network.element.LoadBalancingServiceProvider;

server/src/com/cloud/network/NetworkModelImpl.java

@@ -59,14 +59,19 @@ import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.addr.PublicIp;
 import com.cloud.network.dao.FirewallRulesDao;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkDomainDao;
+import com.cloud.network.dao.NetworkDomainVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkServiceMapVO;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.element.NetworkElement;
 import com.cloud.network.element.UserDataServiceProvider;
 import com.cloud.network.rules.FirewallRule.Purpose;

server/src/com/cloud/network/NetworkServiceImpl.java

@@ -81,14 +81,18 @@ import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
 import com.cloud.network.addr.PublicIp;
 import com.cloud.network.dao.FirewallRulesDao;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkDomainDao;
+import com.cloud.network.dao.NetworkDomainVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.element.NetworkElement;
 import com.cloud.network.element.VirtualRouterElement;
 import com.cloud.network.element.VpcVirtualRouterElement;

server/src/com/cloud/network/NetworkUsageManager.java

@@ -23,6 +23,8 @@ import com.cloud.api.commands.DeleteTrafficMonitorCmd;
 import com.cloud.api.commands.ListTrafficMonitorsCmd;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
+import com.cloud.network.dao.IPAddressVO;
+
 import org.apache.cloudstack.api.response.TrafficMonitorResponse;
 import com.cloud.utils.component.Manager;
 

server/src/com/cloud/network/NetworkUsageManagerImpl.java

@@ -63,7 +63,9 @@ import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;
 import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.resource.TrafficSentinelResource;
 import com.cloud.resource.ResourceManager;
 import com.cloud.resource.ResourceStateAdapter;

server/src/com/cloud/network/PortProfileManagerImpl.java

@@ -22,9 +22,10 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.network.PortProfileVO.BindingType;
-import com.cloud.network.PortProfileVO.PortType;
 import com.cloud.network.dao.PortProfileDaoImpl;
+import com.cloud.network.dao.PortProfileVO;
+import com.cloud.network.dao.PortProfileVO.BindingType;
+import com.cloud.network.dao.PortProfileVO.PortType;
 
 public class PortProfileManagerImpl {
 	    

server/src/com/cloud/network/StorageNetworkManagerImpl.java

@@ -43,6 +43,7 @@ import com.cloud.dc.dao.StorageNetworkIpRangeDao;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.db.SearchCriteria2;

server/src/com/cloud/network/addr/PublicIp.java

@@ -19,8 +19,8 @@ package com.cloud.network.addr;
 import java.util.Date;
 
 import com.cloud.dc.VlanVO;
-import com.cloud.network.IPAddressVO;
 import com.cloud.network.PublicIpAddress;
+import com.cloud.network.dao.IPAddressVO;
 import com.cloud.utils.net.Ip;
 import com.cloud.utils.net.NetUtils;
 

server/src/com/cloud/network/as/AutoScaleManagerImpl.java

@@ -58,7 +58,6 @@ import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.LoadBalancerVO;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.as.AutoScaleCounter.AutoScaleCounterParam;
 import com.cloud.network.as.dao.AutoScalePolicyConditionMapDao;
@@ -71,6 +70,7 @@ import com.cloud.network.as.dao.CounterDao;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.LoadBalancerDao;
 import com.cloud.network.dao.LoadBalancerVMMapDao;
+import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.lb.LoadBalancingRulesManager;
 import com.cloud.offering.ServiceOffering;

server/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java

@@ -18,9 +18,8 @@ package com.cloud.network.dao;
 
 import java.util.List;
 
-import com.cloud.network.ExternalFirewallDeviceVO;
+import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceAllocationState;
-import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceAllocationState;
+import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState;
-import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceState;
 import com.cloud.utils.db.GenericDao;
 
 public interface ExternalFirewallDeviceDao extends GenericDao<ExternalFirewallDeviceVO, Long> {

server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java

@@ -21,9 +21,8 @@ import javax.ejb.Local;
 
 import org.springframework.stereotype.Component;
 
-import com.cloud.network.ExternalFirewallDeviceVO;
+import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceAllocationState;
-import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceAllocationState;
+import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState;
-import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceState;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;

server/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network;
+package com.cloud.network.dao;
 
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;

server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java

@@ -17,9 +17,9 @@
 package com.cloud.network.dao;
 
 import java.util.List;
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+
-import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
-import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
 import com.cloud.utils.db.GenericDao;
 
 public interface ExternalLoadBalancerDeviceDao extends GenericDao<ExternalLoadBalancerDeviceVO, Long> {

server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java

@@ -21,9 +21,8 @@ import javax.ejb.Local;
 
 import org.springframework.stereotype.Component;
 
-import com.cloud.network.ExternalLoadBalancerDeviceVO;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
-import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
+import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
-import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;

server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network;
+package com.cloud.network.dao;
 
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;

server/src/com/cloud/network/dao/FirewallRulesCidrsDao.java

@@ -18,7 +18,6 @@ package com.cloud.network.dao;
 
 import java.util.List;
 
-import com.cloud.network.FirewallRulesCidrsVO;
 import com.cloud.utils.db.GenericDao;
 
 public interface FirewallRulesCidrsDao extends GenericDao<FirewallRulesCidrsVO, Long> {

server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java

@@ -24,7 +24,6 @@ import javax.ejb.Local;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
-import com.cloud.network.FirewallRulesCidrsVO;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;

server/src/com/cloud/network/dao/FirewallRulesCidrsVO.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network;
+package com.cloud.network.dao;
 
 import org.apache.cloudstack.api.InternalIdentity;
 

server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java

@@ -23,7 +23,6 @@ import javax.inject.Inject;
 
 import org.springframework.stereotype.Component;
 
-import com.cloud.network.IPAddressVO;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRule.FirewallRuleType;
 import com.cloud.network.rules.FirewallRule.Purpose;

server/src/com/cloud/network/dao/IPAddressDao.java

@@ -19,7 +19,6 @@ package com.cloud.network.dao;
 import java.util.List;
 
 import com.cloud.dc.Vlan.VlanType;
-import com.cloud.network.IPAddressVO;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.net.Ip;
 

server/src/com/cloud/network/dao/IPAddressDaoImpl.java

@@ -31,7 +31,6 @@ import org.springframework.stereotype.Component;
 import com.cloud.dc.Vlan.VlanType;
 import com.cloud.dc.VlanVO;
 import com.cloud.dc.dao.VlanDaoImpl;
-import com.cloud.network.IPAddressVO;
 import com.cloud.network.IpAddress.State;
 import com.cloud.server.ResourceTag.TaggedResourceType;
 import com.cloud.tags.dao.ResourceTagsDaoImpl;

server/src/com/cloud/network/dao/IPAddressVO.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network;
+package com.cloud.network.dao;
 
 import java.util.Date;
 import java.util.UUID;
@@ -32,6 +32,9 @@ import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
 import org.apache.cloudstack.api.Identity;
+
+import com.cloud.network.IpAddress;
+import com.cloud.network.IpAddress.State;
 import com.cloud.utils.net.Ip;
 import org.apache.cloudstack.api.InternalIdentity;
 

server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java

@@ -16,7 +16,6 @@
 // under the License.
 package com.cloud.network.dao;
 
-import com.cloud.network.InlineLoadBalancerNicMapVO;
 import com.cloud.utils.db.GenericDao;
 
 public interface InlineLoadBalancerNicMapDao extends GenericDao<InlineLoadBalancerNicMapVO, Long> {

server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java

@@ -20,7 +20,6 @@ import javax.ejb.Local;
 
 import org.springframework.stereotype.Component;
 
-import com.cloud.network.InlineLoadBalancerNicMapVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchCriteria;
 

server/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network;
+package com.cloud.network.dao;
 
 import org.apache.cloudstack.api.InternalIdentity;
 

server/src/com/cloud/network/dao/LBStickinessPolicyDao.java

@@ -18,7 +18,6 @@ package com.cloud.network.dao;
 
 import java.util.List;
 
-import com.cloud.network.LBStickinessPolicyVO;
 import com.cloud.utils.db.GenericDao;
 
 

server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java

@@ -22,7 +22,6 @@ import javax.ejb.Local;
 
 import org.springframework.stereotype.Component;
 
-import com.cloud.network.LBStickinessPolicyVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchCriteria;
 

server/src/com/cloud/network/dao/LBStickinessPolicyVO.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network;
+package com.cloud.network.dao;
 
 import java.util.ArrayList;
 import java.util.HashMap;

server/src/com/cloud/network/dao/LoadBalancerDao.java

@@ -18,7 +18,6 @@ package com.cloud.network.dao;
 
 import java.util.List;
 
-import com.cloud.network.LoadBalancerVO;
 import com.cloud.utils.db.GenericDao;
 
 public interface LoadBalancerDao extends GenericDao<LoadBalancerVO, Long> {

server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java

@@ -27,7 +27,6 @@ import javax.inject.Inject;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
-import com.cloud.network.LoadBalancerVO;
 import com.cloud.network.rules.FirewallRule.State;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;

server/src/com/cloud/network/dao/LoadBalancerVMMapDao.java

@@ -18,7 +18,6 @@ package com.cloud.network.dao;
 
 import java.util.List;
 
-import com.cloud.network.LoadBalancerVMMapVO;
 import com.cloud.utils.db.GenericDao;
 
 public interface LoadBalancerVMMapDao extends GenericDao<LoadBalancerVMMapVO, Long> {

server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java

@@ -22,7 +22,6 @@ import javax.ejb.Local;
 
 import org.springframework.stereotype.Component;
 
-import com.cloud.network.LoadBalancerVMMapVO;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
 import com.cloud.utils.db.SearchCriteria;

server/src/com/cloud/network/dao/LoadBalancerVMMapVO.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network;
+package com.cloud.network.dao;
 
 import org.apache.cloudstack.api.InternalIdentity;
 

server/src/com/cloud/network/dao/LoadBalancerVO.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network;
+package com.cloud.network.dao;
 
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorValue;